projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ifxmips: move header files, split up patches, rename some files
[openwrt.git] / target / linux / ifxmips / files / arch / mips / ifxmips / gpio.c
diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/gpio.c b/target/linux/ifxmips/files/arch/mips/ifxmips/gpio.c
index 931d3ac..3ef5100 100644 (file)
--- a/target/linux/ifxmips/files/arch/mips/ifxmips/gpio.c
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/gpio.c
@@ -16,7 +16,7 @@
  *   Copyright (C) 2004 btxu Generate from INCA-IP project
  *   Copyright (C) 2005 Jin-Sze.Sow Comments edited
  *   Copyright (C) 2006 Huang Xiaogang Modification & verification on Danube chip
- *   Copyright (C) 2007 John Crispin <blogic@openwrt.org> 
+ *   Copyright (C) 2007 John Crispin <blogic@openwrt.org>
  */
 
 #include <linux/module.h>
@@ -34,26 +34,26 @@
 #include <linux/skbuff.h>
 #include <linux/netlink.h>
 #include <linux/platform_device.h>
+#include <linux/uaccess.h>
+#include <linux/semaphore.h>
+
 #include <net/sock.h>
-#include <asm/uaccess.h>
-#include <asm/semaphore.h>
-#include <asm/uaccess.h>
-#include <asm/ifxmips/ifxmips.h>
-#include <asm/ifxmips/ifxmips_ioctl.h>
+
+#include <ifxmips.h>
 
 #define MAX_PORTS                      2
 #define PINS_PER_PORT          16
 
 #ifdef CONFIG_IFXMIPS_GPIO_RST_BTN
-#define IFXMIPS_RST_PIN 15
-#define IFXMIPS_RST_PORT 1
 
+unsigned int rst_port = 1;
+unsigned int rst_pin = 15;
 static struct timer_list rst_button_timer;
 
 extern struct sock *uevent_sock;
 extern u64 uevent_next_seqnum(void);
 static unsigned long seen;
-static int pressed = 0;
+static int pressed;
 
 struct event_t {
        struct work_struct wq;
@@ -63,26 +63,24 @@ struct event_t {
 #endif
 
 #define IFXMIPS_GPIO_SANITY            {if (port > MAX_PORTS || pin > PINS_PER_PORT) return -EINVAL; }
-int
-ifxmips_port_reserve_pin(unsigned int port, unsigned int pin)
+
+int ifxmips_port_reserve_pin(unsigned int port, unsigned int pin)
 {
        IFXMIPS_GPIO_SANITY;
-       printk("%s : call to obseleted function\n", __func__);
+       printk(KERN_INFO "%s : call to obseleted function\n", __func__);
        return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_reserve_pin);
 
-int
-ifxmips_port_free_pin(unsigned int port, unsigned int pin)
+int ifxmips_port_free_pin(unsigned int port, unsigned int pin)
 {
        IFXMIPS_GPIO_SANITY;
-       printk("%s : call to obseleted function\n", __func__);
+       printk(KERN_INFO "%s : call to obseleted function\n", __func__);
        return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_free_pin);
 
-int
-ifxmips_port_set_open_drain(unsigned int port, unsigned int pin)
+int ifxmips_port_set_open_drain(unsigned int port, unsigned int pin)
 {
        IFXMIPS_GPIO_SANITY;
        ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_OD + (port * 0xC)) | (1 << pin),
@@ -91,8 +89,7 @@ ifxmips_port_set_open_drain(unsigned int port, unsigned int pin)
 }
 EXPORT_SYMBOL(ifxmips_port_set_open_drain);
 
-int
-ifxmips_port_clear_open_drain(unsigned int port, unsigned int pin)
+int ifxmips_port_clear_open_drain(unsigned int port, unsigned int pin)
 {
        IFXMIPS_GPIO_SANITY;
        ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_OD + (port * 0xC)) & ~(1 << pin),
@@ -101,110 +98,99 @@ ifxmips_port_clear_open_drain(unsigned int port, unsigned int pin)
 }
 EXPORT_SYMBOL(ifxmips_port_clear_open_drain);
 
-int
-ifxmips_port_set_pudsel(unsigned int port, unsigned int pin)
+int ifxmips_port_set_pudsel(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+       IFXMIPS_GPIO_SANITY;
        ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC)) | (1 << pin),
                IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC));
        return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_set_pudsel);
 
-int
-ifxmips_port_clear_pudsel (unsigned int port, unsigned int pin)
+int ifxmips_port_clear_pudsel(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+       IFXMIPS_GPIO_SANITY;
        ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC)) & ~(1 << pin),
                IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC));
        return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_clear_pudsel);
 
-int
-ifxmips_port_set_puden(unsigned int port, unsigned int pin)
+int ifxmips_port_set_puden(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+       IFXMIPS_GPIO_SANITY;
        ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDEN + (port * 0xC)) | (1 << pin),
                IFXMIPS_GPIO_P0_PUDEN + (port * 0xC));
        return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_set_puden);
 
-int
-ifxmips_port_clear_puden(unsigned int port, unsigned int pin)
+int ifxmips_port_clear_puden(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+       IFXMIPS_GPIO_SANITY;
        ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDEN + (port * 0xC)) & ~(1 << pin),
                IFXMIPS_GPIO_P0_PUDEN + (port * 0xC));
        return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_clear_puden);
 
-int
-ifxmips_port_set_stoff(unsigned int port, unsigned int pin)
+int ifxmips_port_set_stoff(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+       IFXMIPS_GPIO_SANITY;
        ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_STOFF + (port * 0xC)) | (1 << pin),
                IFXMIPS_GPIO_P0_STOFF + (port * 0xC));
        return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_set_stoff);
 
-int
-ifxmips_port_clear_stoff(unsigned int port, unsigned int pin)
+int ifxmips_port_clear_stoff(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+       IFXMIPS_GPIO_SANITY;
        ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_STOFF + (port * 0xC)) & ~(1 << pin),
                IFXMIPS_GPIO_P0_STOFF + (port * 0xC));
        return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_clear_stoff);
 
-int
-ifxmips_port_set_dir_out(unsigned int port, unsigned int pin)
+int ifxmips_port_set_dir_out(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+       IFXMIPS_GPIO_SANITY;
        ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_DIR + (port * 0xC)) | (1 << pin),
                IFXMIPS_GPIO_P0_DIR + (port * 0xC));
        return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_set_dir_out);
 
-int
-ifxmips_port_set_dir_in(unsigned int port, unsigned int pin)
+int ifxmips_port_set_dir_in(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+       IFXMIPS_GPIO_SANITY;
        ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_DIR + (port * 0xC)) & ~(1 << pin),
                IFXMIPS_GPIO_P0_DIR + (port * 0xC));
        return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_set_dir_in);
 
-int
-ifxmips_port_set_output(unsigned int port, unsigned int pin)
+int ifxmips_port_set_output(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+       IFXMIPS_GPIO_SANITY;
        ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_OUT + (port * 0xC)) | (1 << pin),
                IFXMIPS_GPIO_P0_OUT + (port * 0xC));
        return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_set_output);
 
-int
-ifxmips_port_clear_output(unsigned int port, unsigned int pin)
+int ifxmips_port_clear_output(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+       IFXMIPS_GPIO_SANITY;
        ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_OUT + (port * 0xC)) & ~(1 << pin),
                IFXMIPS_GPIO_P0_OUT + (port * 0xC));
        return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_clear_output);
 
-int
-ifxmips_port_get_input(unsigned int port, unsigned int pin)
+int ifxmips_port_get_input(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+       IFXMIPS_GPIO_SANITY;
        if (ifxmips_r32(IFXMIPS_GPIO_P0_IN + (port * 0xC)) & (1 << pin))
                return 0;
        else
@@ -212,40 +198,36 @@ ifxmips_port_get_input(unsigned int port, unsigned int pin)
 }
 EXPORT_SYMBOL(ifxmips_port_get_input);
 
-int
-ifxmips_port_set_altsel0(unsigned int port, unsigned int pin)
+int ifxmips_port_set_altsel0(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+       IFXMIPS_GPIO_SANITY;
        ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC)) | (1 << pin),
                IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC));
        return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_set_altsel0);
 
-int
-ifxmips_port_clear_altsel0(unsigned int port, unsigned int pin)
+int ifxmips_port_clear_altsel0(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+       IFXMIPS_GPIO_SANITY;
        ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC)) & ~(1 << pin),
                IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC));
        return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_clear_altsel0);
 
-int
-ifxmips_port_set_altsel1(unsigned int port, unsigned int pin)
+int ifxmips_port_set_altsel1(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+       IFXMIPS_GPIO_SANITY;
        ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC)) | (1 << pin),
                IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC));
        return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_set_altsel1);
 
-int
-ifxmips_port_clear_altsel1(unsigned int port, unsigned int pin)
+int ifxmips_port_clear_altsel1(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+       IFXMIPS_GPIO_SANITY;
        ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC)) & ~(1 << pin),
                IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC));
        return 0;
@@ -253,16 +235,14 @@ ifxmips_port_clear_altsel1(unsigned int port, unsigned int pin)
 EXPORT_SYMBOL(ifxmips_port_clear_altsel1);
 
 #ifdef CONFIG_IFXMIPS_GPIO_RST_BTN
-static inline void
-add_msg(struct sk_buff *skb, char *msg)
+static inline void add_msg(struct sk_buff *skb, char *msg)
 {
        char *scratch;
        scratch = skb_put(skb, strlen(msg) + 1);
        sprintf(scratch, msg);
 }
 
-static void
-hotplug_button(struct work_struct *wq)
+static void hotplug_button(struct work_struct *wq)
 {
        struct sk_buff *skb;
        struct event_t *event;
@@ -271,17 +251,17 @@ hotplug_button(struct work_struct *wq)
        char buf[128];
 
        event = container_of(wq, struct event_t, wq);
-       if(!uevent_sock)
+       if (!uevent_sock)
                goto done;
 
        s = event->set ? "pressed" : "released";
        len = strlen(s) + 2;
        skb = alloc_skb(len + 2048, GFP_KERNEL);
-       if(!skb)
+       if (!skb)
                goto done;
 
        scratch = skb_put(skb, len);
-       sprintf(scratch, "%s@",s);
+       sprintf(scratch, "%s@", s);
        add_msg(skb, "HOME=/");
        add_msg(skb, "PATH=/sbin:/bin:/usr/sbin:/usr/bin");
        add_msg(skb, "SUBSYSTEM=button");
@@ -298,25 +278,21 @@ done:
        kfree(event);
 }
 
-static void
-reset_button_poll(unsigned long unused)
+static void reset_button_poll(unsigned long unused)
 {
        struct event_t *event;
 
-       rst_button_timer.expires = jiffies + HZ;
+       rst_button_timer.expires = jiffies + (HZ / 4);
        add_timer(&rst_button_timer);
 
-       if (pressed != ifxmips_port_get_input(IFXMIPS_RST_PORT, IFXMIPS_RST_PIN))
-       {
-               if(pressed)
+       if (pressed != ifxmips_port_get_input(rst_port, rst_pin)) {
+               if (pressed)
                        pressed = 0;
                else
                        pressed = 1;
-               printk("reset button was %s\n", (pressed ? "pressed" : "released"));
-               event = (struct event_t *) kzalloc(sizeof(struct event_t), GFP_ATOMIC);
-               if (!event)
-               {
-                       printk("Could not alloc hotplug event\n");
+               event = kzalloc(sizeof(struct event_t), GFP_ATOMIC);
+               if (!event) {
+                       printk(KERN_INFO "Could not alloc hotplug event\n");
                        return;
                }
                event->set = pressed;
@@ -328,16 +304,17 @@ reset_button_poll(unsigned long unused)
 }
 #endif
 
-static int
-ifxmips_gpio_probe(struct platform_device *dev)
+static int ifxmips_gpio_probe(struct platform_device *dev)
 {
        int retval = 0;
 
 #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);
+       rst_port = dev->resource[0].start;
+       rst_pin = dev->resource[0].end;
+       ifxmips_port_set_open_drain(rst_port, rst_pin);
+       ifxmips_port_clear_altsel0(rst_port, rst_pin);
+       ifxmips_port_clear_altsel1(rst_port, rst_pin);
+       ifxmips_port_set_dir_in(rst_port, rst_pin);
        seen = jiffies;
        init_timer(&rst_button_timer);
        rst_button_timer.function = reset_button_poll;
@@ -347,8 +324,7 @@ ifxmips_gpio_probe(struct platform_device *dev)
        return retval;
 }
 
-static int
-ifxmips_gpio_remove(struct platform_device *pdev)
+static int ifxmips_gpio_remove(struct platform_device *pdev)
 {
 #ifdef CONFIG_IFXMIPS_GPIO_RST_BTN
        del_timer_sync(&rst_button_timer);
@@ -356,8 +332,7 @@ ifxmips_gpio_remove(struct platform_device *pdev)
        return 0;
 }
 
-static struct
-platform_driver ifxmips_gpio_driver = {
+static struct platform_driver ifxmips_gpio_driver = {
        .probe = ifxmips_gpio_probe,
        .remove = ifxmips_gpio_remove,
        .driver = {
@@ -366,8 +341,7 @@ platform_driver ifxmips_gpio_driver = {
        },
 };
 
-int __init
-ifxmips_gpio_init(void)
+int __init ifxmips_gpio_init(void)
 {
        int ret = platform_driver_register(&ifxmips_gpio_driver);
        if (ret)
@@ -375,8 +349,7 @@ ifxmips_gpio_init(void)
        return ret;
 }
 
-void __exit
-ifxmips_gpio_exit(void)
+void __exit ifxmips_gpio_exit(void)
 {
        platform_driver_unregister(&ifxmips_gpio_driver);
 }
OpenWrt main development branch