Remove unused HDPU driver
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 7 Apr 2010 00:08:49 +0000 (10:08 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 7 Apr 2010 00:08:49 +0000 (10:08 +1000)
This driver seems to be specific to a "Sky CPU" board for which we
don't appear to have upstream support (or not any more). No Kconfig
file in the kernel ever enables it. So remove it.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
drivers/misc/Makefile
drivers/misc/hdpuftrs/Makefile [deleted file]
drivers/misc/hdpuftrs/hdpu_cpustate.c [deleted file]
drivers/misc/hdpuftrs/hdpu_nexus.c [deleted file]
include/linux/hdpu_features.h [deleted file]

index 27c484355414cca3bcea2de7da9b0d4c7cc2150b..208ae3091a4e9d07097da55fcee6fd891162dfb0 100644 (file)
@@ -3,7 +3,6 @@
 #
 
 obj-$(CONFIG_IBM_ASM)          += ibmasm/
-obj-$(CONFIG_HDPU_FEATURES)    += hdpuftrs/
 obj-$(CONFIG_AD525X_DPOT)      += ad525x_dpot.o
 obj-$(CONFIG_ATMEL_PWM)                += atmel_pwm.o
 obj-$(CONFIG_ATMEL_SSC)                += atmel-ssc.o
diff --git a/drivers/misc/hdpuftrs/Makefile b/drivers/misc/hdpuftrs/Makefile
deleted file mode 100644 (file)
index ac74ae6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-obj-$(CONFIG_HDPU_FEATURES) := hdpu_cpustate.o hdpu_nexus.o
diff --git a/drivers/misc/hdpuftrs/hdpu_cpustate.c b/drivers/misc/hdpuftrs/hdpu_cpustate.c
deleted file mode 100644 (file)
index 176fe4e..0000000
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- *     Sky CPU State Driver
- *
- *     Copyright (C) 2002 Brian Waite
- *
- *     This driver allows use of the CPU state bits
- *     It exports the /dev/sky_cpustate and also
- *     /proc/sky_cpustate pseudo-file for status information.
- *
- *     This program is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License
- *     as published by the Free Software Foundation; either version
- *     2 of the License, or (at your option) any later version.
- *
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/spinlock.h>
-#include <linux/smp_lock.h>
-#include <linux/miscdevice.h>
-#include <linux/proc_fs.h>
-#include <linux/hdpu_features.h>
-#include <linux/platform_device.h>
-#include <asm/uaccess.h>
-#include <linux/seq_file.h>
-#include <asm/io.h>
-
-#define SKY_CPUSTATE_VERSION           "1.1"
-
-static int hdpu_cpustate_probe(struct platform_device *pdev);
-static int hdpu_cpustate_remove(struct platform_device *pdev);
-
-static unsigned char cpustate_get_state(void);
-static int cpustate_proc_open(struct inode *inode, struct file *file);
-static int cpustate_proc_read(struct seq_file *seq, void *offset);
-
-static struct cpustate_t cpustate;
-
-static const struct file_operations proc_cpustate = {
-       .open = cpustate_proc_open,
-       .read = seq_read,
-       .llseek = seq_lseek,
-       .release = single_release,
-       .owner = THIS_MODULE,
-};
-
-static int cpustate_proc_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, cpustate_proc_read, NULL);
-}
-
-static int cpustate_proc_read(struct seq_file *seq, void *offset)
-{
-       seq_printf(seq, "CPU State: %04x\n", cpustate_get_state());
-       return 0;
-}
-
-static int cpustate_get_ref(int excl)
-{
-
-       int retval = -EBUSY;
-
-       spin_lock(&cpustate.lock);
-
-       if (cpustate.excl)
-               goto out_busy;
-
-       if (excl) {
-               if (cpustate.open_count)
-                       goto out_busy;
-               cpustate.excl = 1;
-       }
-
-       cpustate.open_count++;
-       retval = 0;
-
-      out_busy:
-       spin_unlock(&cpustate.lock);
-       return retval;
-}
-
-static int cpustate_free_ref(void)
-{
-
-       spin_lock(&cpustate.lock);
-
-       cpustate.excl = 0;
-       cpustate.open_count--;
-
-       spin_unlock(&cpustate.lock);
-       return 0;
-}
-
-static unsigned char cpustate_get_state(void)
-{
-
-       return cpustate.cached_val;
-}
-
-static void cpustate_set_state(unsigned char new_state)
-{
-       unsigned int state = (new_state << 21);
-
-#ifdef DEBUG_CPUSTATE
-       printk("CPUSTATE -> 0x%x\n", new_state);
-#endif
-       spin_lock(&cpustate.lock);
-       cpustate.cached_val = new_state;
-       writel((0xff << 21), cpustate.clr_addr);
-       writel(state, cpustate.set_addr);
-       spin_unlock(&cpustate.lock);
-}
-
-/*
- *     Now all the various file operations that we export.
- */
-
-static ssize_t cpustate_read(struct file *file, char *buf,
-                            size_t count, loff_t * ppos)
-{
-       unsigned char data;
-
-       if (count < 0)
-               return -EFAULT;
-       if (count == 0)
-               return 0;
-
-       data = cpustate_get_state();
-       if (copy_to_user(buf, &data, sizeof(unsigned char)))
-               return -EFAULT;
-       return sizeof(unsigned char);
-}
-
-static ssize_t cpustate_write(struct file *file, const char *buf,
-                             size_t count, loff_t * ppos)
-{
-       unsigned char data;
-
-       if (count < 0)
-               return -EFAULT;
-
-       if (count == 0)
-               return 0;
-
-       if (copy_from_user((unsigned char *)&data, buf, sizeof(unsigned char)))
-               return -EFAULT;
-
-       cpustate_set_state(data);
-       return sizeof(unsigned char);
-}
-
-static int cpustate_open(struct inode *inode, struct file *file)
-{
-       int ret;
-
-       lock_kernel();
-       ret = cpustate_get_ref((file->f_flags & O_EXCL));
-       unlock_kernel();
-
-       return ret;
-}
-
-static int cpustate_release(struct inode *inode, struct file *file)
-{
-       return cpustate_free_ref();
-}
-
-static struct platform_driver hdpu_cpustate_driver = {
-       .probe = hdpu_cpustate_probe,
-       .remove = hdpu_cpustate_remove,
-       .driver = {
-               .name = HDPU_CPUSTATE_NAME,
-               .owner = THIS_MODULE,
-       },
-};
-
-/*
- *     The various file operations we support.
- */
-static const struct file_operations cpustate_fops = {
-      .owner   = THIS_MODULE,
-      .open    = cpustate_open,
-      .release = cpustate_release,
-      .read    = cpustate_read,
-      .write   = cpustate_write,
-      .llseek  = no_llseek,
-};
-
-static struct miscdevice cpustate_dev = {
-       .minor  = MISC_DYNAMIC_MINOR,
-       .name   = "sky_cpustate",
-       .fops   = &cpustate_fops,
-};
-
-static int hdpu_cpustate_probe(struct platform_device *pdev)
-{
-       struct resource *res;
-       struct proc_dir_entry *proc_de;
-       int ret;
-
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res) {
-               printk(KERN_ERR "sky_cpustate: "
-                      "Invalid memory resource.\n");
-               return -EINVAL;
-       }
-       cpustate.set_addr = (unsigned long *)res->start;
-       cpustate.clr_addr = (unsigned long *)res->end - 1;
-
-       ret = misc_register(&cpustate_dev);
-       if (ret) {
-               printk(KERN_WARNING "sky_cpustate: "
-                      "Unable to register misc device.\n");
-               cpustate.set_addr = NULL;
-               cpustate.clr_addr = NULL;
-               return ret;
-       }
-
-       proc_de = proc_create("sky_cpustate", 0666, NULL, &proc_cpustate);
-       if (!proc_de) {
-               printk(KERN_WARNING "sky_cpustate: "
-                      "Unable to create proc entry\n");
-       }
-
-       printk(KERN_INFO "Sky CPU State Driver v" SKY_CPUSTATE_VERSION "\n");
-       return 0;
-}
-
-static int hdpu_cpustate_remove(struct platform_device *pdev)
-{
-       cpustate.set_addr = NULL;
-       cpustate.clr_addr = NULL;
-
-       remove_proc_entry("sky_cpustate", NULL);
-       misc_deregister(&cpustate_dev);
-
-       return 0;
-}
-
-static int __init cpustate_init(void)
-{
-       return platform_driver_register(&hdpu_cpustate_driver);
-}
-
-static void __exit cpustate_exit(void)
-{
-       platform_driver_unregister(&hdpu_cpustate_driver);
-}
-
-module_init(cpustate_init);
-module_exit(cpustate_exit);
-
-MODULE_AUTHOR("Brian Waite");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:" HDPU_CPUSTATE_NAME);
diff --git a/drivers/misc/hdpuftrs/hdpu_nexus.c b/drivers/misc/hdpuftrs/hdpu_nexus.c
deleted file mode 100644 (file)
index ce39fa5..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- *     Sky Nexus Register Driver
- *
- *     Copyright (C) 2002 Brian Waite
- *
- *     This driver allows reading the Nexus register
- *     It exports the /proc/sky_chassis_id and also
- *     /proc/sky_slot_id pseudo-file for status information.
- *
- *     This program is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License
- *     as published by the Free Software Foundation; either version
- *     2 of the License, or (at your option) any later version.
- *
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/proc_fs.h>
-#include <linux/hdpu_features.h>
-#include <linux/platform_device.h>
-#include <linux/seq_file.h>
-#include <asm/io.h>
-
-static int hdpu_nexus_probe(struct platform_device *pdev);
-static int hdpu_nexus_remove(struct platform_device *pdev);
-static int hdpu_slot_id_open(struct inode *inode, struct file *file);
-static int hdpu_slot_id_read(struct seq_file *seq, void *offset);
-static int hdpu_chassis_id_open(struct inode *inode, struct file *file);
-static int hdpu_chassis_id_read(struct seq_file *seq, void *offset);
-
-static struct proc_dir_entry *hdpu_slot_id;
-static struct proc_dir_entry *hdpu_chassis_id;
-static int slot_id = -1;
-static int chassis_id = -1;
-
-static const struct file_operations proc_slot_id = {
-       .open = hdpu_slot_id_open,
-       .read = seq_read,
-       .llseek = seq_lseek,
-       .release = single_release,
-       .owner = THIS_MODULE,
-};
-
-static const struct file_operations proc_chassis_id = {
-       .open = hdpu_chassis_id_open,
-       .read = seq_read,
-       .llseek = seq_lseek,
-       .release = single_release,
-       .owner = THIS_MODULE,
-};
-
-static struct platform_driver hdpu_nexus_driver = {
-       .probe = hdpu_nexus_probe,
-       .remove = hdpu_nexus_remove,
-       .driver = {
-               .name = HDPU_NEXUS_NAME,
-               .owner = THIS_MODULE,
-       },
-};
-
-static int hdpu_slot_id_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, hdpu_slot_id_read, NULL);
-}
-
-static int hdpu_slot_id_read(struct seq_file *seq, void *offset)
-{
-       seq_printf(seq, "%d\n", slot_id);
-       return 0;
-}
-
-static int hdpu_chassis_id_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, hdpu_chassis_id_read, NULL);
-}
-
-static int hdpu_chassis_id_read(struct seq_file *seq, void *offset)
-{
-       seq_printf(seq, "%d\n", chassis_id);
-       return 0;
-}
-
-static int hdpu_nexus_probe(struct platform_device *pdev)
-{
-       struct resource *res;
-       int *nexus_id_addr;
-
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res) {
-               printk(KERN_ERR "sky_nexus: "
-                      "Invalid memory resource.\n");
-               return -EINVAL;
-       }
-       nexus_id_addr = ioremap(res->start,
-                               (unsigned long)(res->end - res->start));
-       if (nexus_id_addr) {
-               slot_id = (*nexus_id_addr >> 8) & 0x1f;
-               chassis_id = *nexus_id_addr & 0xff;
-               iounmap(nexus_id_addr);
-       } else {
-               printk(KERN_ERR "sky_nexus: Could not map slot id\n");
-       }
-
-       hdpu_slot_id = proc_create("sky_slot_id", 0666, NULL, &proc_slot_id);
-       if (!hdpu_slot_id) {
-               printk(KERN_WARNING "sky_nexus: "
-                      "Unable to create proc dir entry: sky_slot_id\n");
-       }
-
-       hdpu_chassis_id = proc_create("sky_chassis_id", 0666, NULL,
-                                     &proc_chassis_id);
-       if (!hdpu_chassis_id)
-               printk(KERN_WARNING "sky_nexus: "
-                      "Unable to create proc dir entry: sky_chassis_id\n");
-
-       return 0;
-}
-
-static int hdpu_nexus_remove(struct platform_device *pdev)
-{
-       slot_id = -1;
-       chassis_id = -1;
-
-       remove_proc_entry("sky_slot_id", NULL);
-       remove_proc_entry("sky_chassis_id", NULL);
-
-       hdpu_slot_id = 0;
-       hdpu_chassis_id = 0;
-
-       return 0;
-}
-
-static int __init nexus_init(void)
-{
-       return platform_driver_register(&hdpu_nexus_driver);
-}
-
-static void __exit nexus_exit(void)
-{
-       platform_driver_unregister(&hdpu_nexus_driver);
-}
-
-module_init(nexus_init);
-module_exit(nexus_exit);
-
-MODULE_AUTHOR("Brian Waite");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:" HDPU_NEXUS_NAME);
diff --git a/include/linux/hdpu_features.h b/include/linux/hdpu_features.h
deleted file mode 100644 (file)
index 6a87154..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <linux/spinlock.h>
-
-struct cpustate_t {
-       spinlock_t lock;
-       int excl;
-        int open_count;
-       unsigned char cached_val;
-       int inited;
-       unsigned long *set_addr;
-       unsigned long *clr_addr;
-};
-
-
-#define HDPU_CPUSTATE_NAME "hdpu cpustate"
-#define HDPU_NEXUS_NAME "hdpu nexus"
-
-#define CPUSTATE_KERNEL_MAJOR  0x10
-
-#define CPUSTATE_KERNEL_INIT_DRV   0 /* CPU State Driver Initialized */
-#define CPUSTATE_KERNEL_INIT_PCI   1 /* 64360 PCI Busses Init */
-#define CPUSTATE_KERNEL_INIT_REG   2 /* 64360 Bridge Init */
-#define CPUSTATE_KERNEL_CPU1_KICK  3 /* Boot cpu 1 */
-#define CPUSTATE_KERNEL_CPU1_OK    4  /* Cpu 1 has checked in */
-#define CPUSTATE_KERNEL_OK         5 /* Terminal state */
-#define CPUSTATE_KERNEL_RESET   14 /* Board reset via SW*/
-#define CPUSTATE_KERNEL_HALT   15 /* Board halted via SW*/