remove proc and char dev from ifxmips gpio driver
[openwrt.git] / target / linux / ifxmips / files / drivers / char / ifxmips_gpio.c
index df0a5cd..8beb0b8 100644 (file)
@@ -32,7 +32,7 @@
 #include <linux/workqueue.h>
 #include <linux/skbuff.h>
 #include <linux/netlink.h>
-#include <linux/platform_device.h> 
+#include <linux/platform_device.h>
 #include <net/sock.h>
 #include <asm/uaccess.h>
 #include <asm/semaphore.h>
@@ -43,7 +43,7 @@
 #define MAX_PORTS                      2
 #define PINS_PER_PORT          16
 
-#define DRVNAME                                "ifxmips_gpio"  
+#define DRVNAME                                "ifxmips_gpio"
 
 static unsigned int ifxmips_gpio_major = 0;
 
@@ -51,7 +51,7 @@ static unsigned int ifxmips_gpio_major = 0;
 #define IFXMIPS_RST_PIN 15
 #define IFXMIPS_RST_PORT 1
 
-static struct timer_list rst_button_timer; 
+static struct timer_list rst_button_timer;
 
 extern struct sock *uevent_sock;
 extern u64 uevent_next_seqnum(void);
@@ -95,7 +95,7 @@ int
 ifxmips_port_set_open_drain (unsigned int port, unsigned int pin)
 {
        IFXMIPS_GPIO_SANITY;
-       writel(readl(IFXMIPS_GPIO_P0_OD + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_OD + (port * 0xC));
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_OD + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_OD + (port * 0xC));
 
        return 0;
 }
@@ -105,7 +105,7 @@ int
 ifxmips_port_clear_open_drain (unsigned int port, unsigned int pin)
 {
        IFXMIPS_GPIO_SANITY;
-       writel(readl(IFXMIPS_GPIO_P0_OD + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_OD + (port * 0xC));
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_OD + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_OD + (port * 0xC));
 
        return 0;
 }
@@ -115,7 +115,7 @@ int
 ifxmips_port_set_pudsel (unsigned int port, unsigned int pin)
 {
     IFXMIPS_GPIO_SANITY;
-       writel(readl(IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC));
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC));
 
        return 0;
 }
@@ -125,7 +125,7 @@ int
 ifxmips_port_clear_pudsel (unsigned int port, unsigned int pin)
 {
     IFXMIPS_GPIO_SANITY;
-       writel(readl(IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC));
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC));
 
        return 0;
 }
@@ -135,7 +135,7 @@ int
 ifxmips_port_set_puden (unsigned int port, unsigned int pin)
 {
     IFXMIPS_GPIO_SANITY;
-       writel(readl(IFXMIPS_GPIO_P0_PUDEN + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_PUDEN + (port * 0xC));
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDEN + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_PUDEN + (port * 0xC));
 
        return 0;
 }
@@ -145,7 +145,7 @@ int
 ifxmips_port_clear_puden (unsigned int port, unsigned int pin)
 {
     IFXMIPS_GPIO_SANITY;
-       writel(readl(IFXMIPS_GPIO_P0_PUDEN + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_PUDEN + (port * 0xC));
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDEN + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_PUDEN + (port * 0xC));
 
        return 0;
 }
@@ -155,7 +155,7 @@ int
 ifxmips_port_set_stoff (unsigned int port, unsigned int pin)
 {
     IFXMIPS_GPIO_SANITY;
-       writel(readl(IFXMIPS_GPIO_P0_STOFF + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_STOFF + (port * 0xC));
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_STOFF + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_STOFF + (port * 0xC));
 
        return 0;
 }
@@ -165,7 +165,7 @@ int
 ifxmips_port_clear_stoff (unsigned int port, unsigned int pin)
 {
     IFXMIPS_GPIO_SANITY;
-       writel(readl(IFXMIPS_GPIO_P0_STOFF + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_STOFF + (port * 0xC));
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_STOFF + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_STOFF + (port * 0xC));
 
        return 0;
 }
@@ -175,7 +175,7 @@ int
 ifxmips_port_set_dir_out (unsigned int port, unsigned int pin)
 {
     IFXMIPS_GPIO_SANITY;
-       writel(readl(IFXMIPS_GPIO_P0_DIR + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_DIR + (port * 0xC));
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_DIR + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_DIR + (port * 0xC));
 
        return 0;
 }
@@ -185,7 +185,7 @@ int
 ifxmips_port_set_dir_in (unsigned int port, unsigned int pin)
 {
     IFXMIPS_GPIO_SANITY;
-       writel(readl(IFXMIPS_GPIO_P0_DIR + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_DIR + (port * 0xC));
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_DIR + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_DIR + (port * 0xC));
 
        return 0;
 }
@@ -195,7 +195,7 @@ int
 ifxmips_port_set_output (unsigned int port, unsigned int pin)
 {
     IFXMIPS_GPIO_SANITY;
-       writel(readl(IFXMIPS_GPIO_P0_OUT + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_OUT + (port * 0xC));
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_OUT + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_OUT + (port * 0xC));
 
        return 0;
 }
@@ -205,7 +205,7 @@ int
 ifxmips_port_clear_output (unsigned int port, unsigned int pin)
 {
     IFXMIPS_GPIO_SANITY;
-       writel(readl(IFXMIPS_GPIO_P0_OUT + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_OUT + (port * 0xC));
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_OUT + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_OUT + (port * 0xC));
 
        return 0;
 }
@@ -216,7 +216,7 @@ ifxmips_port_get_input (unsigned int port, unsigned int pin)
 {
     IFXMIPS_GPIO_SANITY;
 
-       if (readl(IFXMIPS_GPIO_P0_IN + (port * 0xC)) & (1 << pin))
+       if (ifxmips_r32(IFXMIPS_GPIO_P0_IN + (port * 0xC)) & (1 << pin))
                return 0;
        else
                return 1;
@@ -227,7 +227,7 @@ int
 ifxmips_port_set_altsel0 (unsigned int port, unsigned int pin)
 {
     IFXMIPS_GPIO_SANITY;
-       writel(readl(IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC));
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC));
 
        return 0;
 }
@@ -237,7 +237,7 @@ int
 ifxmips_port_clear_altsel0 (unsigned int port, unsigned int pin)
 {
     IFXMIPS_GPIO_SANITY;
-       writel(readl(IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC));
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC));
 
        return 0;
 }
@@ -247,7 +247,7 @@ int
 ifxmips_port_set_altsel1 (unsigned int port, unsigned int pin)
 {
     IFXMIPS_GPIO_SANITY;
-       writel(readl(IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC));
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC));
 
        return 0;
 }
@@ -257,7 +257,7 @@ int
 ifxmips_port_clear_altsel1 (unsigned int port, unsigned int pin)
 {
     IFXMIPS_GPIO_SANITY;
-       writel(readl(IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC));
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC));
 
        return 0;
 }
@@ -315,10 +315,10 @@ done:
 static void reset_button_poll(unsigned long unused)
 {
        struct event_t *event;
-       
+
        rst_button_timer.expires = jiffies + HZ;
        add_timer(&rst_button_timer);
-       
+
        if (pressed != ifxmips_port_get_input(IFXMIPS_RST_PORT, IFXMIPS_RST_PIN))
        {
                if(pressed)
@@ -341,181 +341,6 @@ static void reset_button_poll(unsigned long unused)
 }
 #endif
 
-long ifxmips_port_read_procmem_helper(char* tag, u32* in_reg, char *buf)
-{
-       u32 reg, bit = 0;
-       unsigned int len, t;
-
-       len = sprintf(buf, "\n%s: ", tag);
-       reg = readl(in_reg);
-       bit = 0x80000000;
-       for (t = 0; t < 32; t++) {
-               if ((reg & bit) > 0)
-                       len = len + sprintf(buf + len, "X");
-               else
-                       len = len + sprintf(buf + len, " ");
-               bit = bit >> 1;
-       }
-
-       return len;
-}
-
-int
-ifxmips_port_read_procmem (char *buf, char **start, off_t offset, int count,
-                         int *eof, void *data)
-{
-       long len = sprintf (buf, "\nIFXMips Port Settings\n");
-
-       len += sprintf (buf + len,
-                       "         3         2         1         0\n");
-       len += sprintf (buf + len,
-                       "        10987654321098765432109876543210\n");
-       len += sprintf (buf + len,
-                       "----------------------------------------\n");
-
-       len += ifxmips_port_read_procmem_helper("P0-OUT", IFXMIPS_GPIO_P0_OUT, &buf[len]);
-       len += ifxmips_port_read_procmem_helper("P1-OUT", IFXMIPS_GPIO_P1_OUT, &buf[len]);
-       len += ifxmips_port_read_procmem_helper("P0-IN ", IFXMIPS_GPIO_P0_IN, &buf[len]);
-       len += ifxmips_port_read_procmem_helper("P1-IN ", IFXMIPS_GPIO_P1_IN, &buf[len]);
-       len += ifxmips_port_read_procmem_helper("P0-DIR", IFXMIPS_GPIO_P0_DIR, &buf[len]);
-       len += ifxmips_port_read_procmem_helper("P1-DIR", IFXMIPS_GPIO_P1_DIR, &buf[len]);
-       len += ifxmips_port_read_procmem_helper("P0-STO ", IFXMIPS_GPIO_P0_STOFF, &buf[len]);
-       len += ifxmips_port_read_procmem_helper("P1-STO ", IFXMIPS_GPIO_P1_STOFF, &buf[len]);
-       len += ifxmips_port_read_procmem_helper("P0-PUDE", IFXMIPS_GPIO_P0_PUDEN, &buf[len]);
-       len += ifxmips_port_read_procmem_helper("P1-PUDE", IFXMIPS_GPIO_P1_PUDEN, &buf[len]);
-       len += ifxmips_port_read_procmem_helper("P0-OD  ", IFXMIPS_GPIO_P0_OD, &buf[len]);
-       len += ifxmips_port_read_procmem_helper("P1-OD  ", IFXMIPS_GPIO_P1_OD, &buf[len]);
-       len += ifxmips_port_read_procmem_helper("P0-PUDS", IFXMIPS_GPIO_P0_PUDSEL, &buf[len]);
-       len += ifxmips_port_read_procmem_helper("P1-PUDS", IFXMIPS_GPIO_P1_PUDSEL, &buf[len]);
-       len += ifxmips_port_read_procmem_helper("P0-ALT0", IFXMIPS_GPIO_P0_ALTSEL0, &buf[len]);
-       len += ifxmips_port_read_procmem_helper("P1-ALT0", IFXMIPS_GPIO_P1_ALTSEL0, &buf[len]);
-       len += ifxmips_port_read_procmem_helper("P0-ALT1", IFXMIPS_GPIO_P0_ALTSEL1, &buf[len]);
-       len += ifxmips_port_read_procmem_helper("P1-ALT1", IFXMIPS_GPIO_P1_ALTSEL1, &buf[len]);
-       len = len + sprintf (buf + len, "\n\n");
-
-       *eof = 1;
-
-       return len;
-}
-
-static int
-ifxmips_port_open (struct inode *inode, struct file *filep)
-{
-       return 0;
-}
-
-static int
-ifxmips_port_release (struct inode *inode, struct file *filelp)
-{
-       return 0;
-}
-
-static int
-ifxmips_port_ioctl (struct inode *inode, struct file *filp,
-                       unsigned int cmd, unsigned long arg)
-{
-       int ret = 0;
-       volatile struct ifxmips_port_ioctl_parm parm;
-
-       if (_IOC_TYPE (cmd) != IFXMIPS_PORT_IOC_MAGIC)
-               return -EINVAL;
-
-       if (_IOC_DIR (cmd) & _IOC_WRITE) {
-               if (!access_ok
-                   (VERIFY_READ, arg,
-                    sizeof (struct ifxmips_port_ioctl_parm)))
-                       return -EFAULT;
-               ret = copy_from_user ((void *) &parm, (void *) arg,
-                                     sizeof (struct ifxmips_port_ioctl_parm));
-       }
-       if (_IOC_DIR (cmd) & _IOC_READ) {
-               if (!access_ok
-                   (VERIFY_WRITE, arg,
-                    sizeof (struct ifxmips_port_ioctl_parm)))
-                       return -EFAULT;
-       }
-
-       if (down_trylock (&port_sem) != 0)
-               return -EBUSY;
-
-       switch (cmd) {
-       case IFXMIPS_PORT_IOCOD:
-               if (parm.value == 0x00)
-                       ifxmips_port_clear_open_drain(parm.port, parm.pin);
-               else
-                       ifxmips_port_set_open_drain(parm.port, parm.pin);
-               break;
-
-       case IFXMIPS_PORT_IOCPUDSEL:
-               if (parm.value == 0x00)
-                       ifxmips_port_clear_pudsel(parm.port, parm.pin);
-               else
-                       ifxmips_port_set_pudsel(parm.port, parm.pin);
-               break;
-
-       case IFXMIPS_PORT_IOCPUDEN:
-               if (parm.value == 0x00)
-                       ifxmips_port_clear_puden(parm.port, parm.pin);
-               else
-                       ifxmips_port_set_puden(parm.port, parm.pin);
-               break;
-
-       case IFXMIPS_PORT_IOCSTOFF:
-               if (parm.value == 0x00)
-                       ifxmips_port_clear_stoff(parm.port, parm.pin);
-               else
-                       ifxmips_port_set_stoff(parm.port, parm.pin);
-               break;
-
-       case IFXMIPS_PORT_IOCDIR:
-               if (parm.value == 0x00)
-                       ifxmips_port_set_dir_in(parm.port, parm.pin);
-               else
-                       ifxmips_port_set_dir_out(parm.port, parm.pin);
-               break;
-
-       case IFXMIPS_PORT_IOCOUTPUT:
-               if (parm.value == 0x00)
-                       ifxmips_port_clear_output(parm.port, parm.pin);
-               else
-                       ifxmips_port_set_output(parm.port, parm.pin);
-               break;
-
-       case IFXMIPS_PORT_IOCALTSEL0:
-               if (parm.value == 0x00)
-                       ifxmips_port_clear_altsel0(parm.port, parm.pin);
-               else
-                       ifxmips_port_set_altsel0(parm.port, parm.pin);
-               break;
-
-       case IFXMIPS_PORT_IOCALTSEL1:
-               if (parm.value == 0x00)
-                       ifxmips_port_clear_altsel1(parm.port, parm.pin);
-               else
-                       ifxmips_port_set_altsel1(parm.port, parm.pin);
-               break;
-
-       case IFXMIPS_PORT_IOCINPUT:
-               parm.value = ifxmips_port_get_input(parm.port, parm.pin);
-               copy_to_user((void*)arg, (void*)&parm,
-                       sizeof(struct ifxmips_port_ioctl_parm));
-               break;
-
-       default:
-               ret = -EINVAL;
-       }
-
-       up (&port_sem);
-
-       return ret;
-}
-
-static struct file_operations port_fops = {
-      .open = ifxmips_port_open,
-      .release = ifxmips_port_release,
-      .ioctl = ifxmips_port_ioctl
-};
-
 static int
 ifxmips_gpio_probe (struct platform_device *dev)
 {
@@ -523,22 +348,12 @@ ifxmips_gpio_probe (struct platform_device *dev)
 
        sema_init (&port_sem, 1);
 
-       ifxmips_gpio_major = register_chrdev(0, DRVNAME, &port_fops);
-       if (!ifxmips_gpio_major)
-       {
-               printk(KERN_INFO DRVNAME ": Error! Could not register port device. #%d\n", ifxmips_gpio_major);
-               retval = -EINVAL;
-               goto out;
-       }
-
-       create_proc_read_entry(DRVNAME, 0, NULL, ifxmips_port_read_procmem, NULL);
-
 #ifdef CONFIG_IFXMIPS_GPIO_RST_BTN
        ifxmips_port_set_open_drain(IFXMIPS_RST_PORT, IFXMIPS_RST_PIN);
        ifxmips_port_clear_altsel0(IFXMIPS_RST_PORT, IFXMIPS_RST_PIN);
        ifxmips_port_clear_altsel1(IFXMIPS_RST_PORT, IFXMIPS_RST_PIN);
        ifxmips_port_set_dir_in(IFXMIPS_RST_PORT, IFXMIPS_RST_PIN);
-       
+
        seen = jiffies;
 
        init_timer(&rst_button_timer);
@@ -549,7 +364,6 @@ ifxmips_gpio_probe (struct platform_device *dev)
 
        printk(KERN_INFO DRVNAME ": device successfully initialized #%d.\n", ifxmips_gpio_major);
 
-out:
        return retval;
 }
 
@@ -560,34 +374,33 @@ ifxmips_gpio_remove (struct platform_device *pdev)
        del_timer_sync(&rst_button_timer);
 #endif
        unregister_chrdev(ifxmips_gpio_major, DRVNAME);
-       remove_proc_entry(DRVNAME, NULL);
 
        return 0;
 }
 
-static struct 
-platform_driver ifxmips_gpio_driver = { 
-       .probe = ifxmips_gpio_probe, 
-       .remove = ifxmips_gpio_remove, 
-       .driver = { 
-               .name = DRVNAME, 
-               .owner = THIS_MODULE, 
-       }, 
-}; 
+static struct
+platform_driver ifxmips_gpio_driver = {
+       .probe = ifxmips_gpio_probe,
+       .remove = ifxmips_gpio_remove,
+       .driver = {
+               .name = DRVNAME,
+               .owner = THIS_MODULE,
+       },
+};
 
 int __init
 ifxmips_gpio_init (void)
 {
-       int ret = platform_driver_register(&ifxmips_gpio_driver); 
-       if (ret) 
-               printk(KERN_INFO DRVNAME ": Error registering platfom driver!"); 
-       return ret; 
+       int ret = platform_driver_register(&ifxmips_gpio_driver);
+       if (ret)
+               printk(KERN_INFO DRVNAME ": Error registering platfom driver!");
+       return ret;
 }
 
 void __exit
 ifxmips_gpio_exit (void)
 {
-       platform_driver_unregister(&ifxmips_gpio_driver); 
+       platform_driver_unregister(&ifxmips_gpio_driver);
 }
 
 module_init(ifxmips_gpio_init);
This page took 0.033141 seconds and 4 git commands to generate.