implement gpiolib drivers for core gpio and ebu attached latches

SVN-Revision: 20418

3 files changed, 114 insertions, 229 deletions

diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/gpio.c b/target/linux/ifxmips/files/arch/mips/ifxmips/gpio.c
index 3ef5100ab2..1ac00ded5b 100644
--- a/target/linux/ifxmips/files/arch/mips/ifxmips/gpio.c
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/gpio.c
@@ -36,6 +36,7 @@
 #include <linux/platform_device.h>
 #include <linux/uaccess.h>
 #include <linux/semaphore.h>
+#include <linux/gpio.h>
 
 #include <net/sock.h>
 
@@ -44,27 +45,13 @@
 #define MAX_PORTS			2
 #define PINS_PER_PORT		16
 
-#ifdef CONFIG_IFXMIPS_GPIO_RST_BTN
-
-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;
-
-struct event_t {
-	struct work_struct wq;
-	int set;
-	unsigned long jiffies;
-};
-#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)
+#define GPIO_TO_PORT(x) ((x > 15) ? (1) : (0))
+#define GPIO_TO_GPIO(x) ((x > 15) ? (x - 16) : (x))
+
+int
+ifxmips_port_reserve_pin(unsigned int port, unsigned int pin)
 {
 	IFXMIPS_GPIO_SANITY;
 	printk(KERN_INFO "%s : call to obseleted function\n", __func__);
@@ -72,7 +59,8 @@ int ifxmips_port_reserve_pin(unsigned int port, unsigned int pin)
 }
 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(KERN_INFO "%s : call to obseleted function\n", __func__);
@@ -80,7 +68,8 @@ int ifxmips_port_free_pin(unsigned int port, unsigned int pin)
 }
 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),
@@ -89,7 +78,8 @@ int 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),
@@ -98,7 +88,8 @@ int 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_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC)) | (1 << pin),
@@ -107,7 +98,8 @@ int ifxmips_port_set_pudsel(unsigned int port, unsigned int pin)
 }
 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_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC)) & ~(1 << pin),
@@ -116,7 +108,8 @@ int ifxmips_port_clear_pudsel(unsigned int port, unsigned int pin)
 }
 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_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDEN + (port * 0xC)) | (1 << pin),
@@ -125,7 +118,8 @@ int ifxmips_port_set_puden(unsigned int port, unsigned int pin)
 }
 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_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDEN + (port * 0xC)) & ~(1 << pin),
@@ -134,7 +128,8 @@ int ifxmips_port_clear_puden(unsigned int port, unsigned int pin)
 }
 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_w32(ifxmips_r32(IFXMIPS_GPIO_P0_STOFF + (port * 0xC)) | (1 << pin),
@@ -143,7 +138,8 @@ int ifxmips_port_set_stoff(unsigned int port, unsigned int pin)
 }
 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_w32(ifxmips_r32(IFXMIPS_GPIO_P0_STOFF + (port * 0xC)) & ~(1 << pin),
@@ -152,7 +148,8 @@ int ifxmips_port_clear_stoff(unsigned int port, unsigned int pin)
 }
 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_w32(ifxmips_r32(IFXMIPS_GPIO_P0_DIR + (port * 0xC)) | (1 << pin),
@@ -161,7 +158,8 @@ int ifxmips_port_set_dir_out(unsigned int port, unsigned int pin)
 }
 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_w32(ifxmips_r32(IFXMIPS_GPIO_P0_DIR + (port * 0xC)) & ~(1 << pin),
@@ -170,7 +168,8 @@ int ifxmips_port_set_dir_in(unsigned int port, unsigned int pin)
 }
 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_w32(ifxmips_r32(IFXMIPS_GPIO_P0_OUT + (port * 0xC)) | (1 << pin),
@@ -179,7 +178,8 @@ int ifxmips_port_set_output(unsigned int port, unsigned int pin)
 }
 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_w32(ifxmips_r32(IFXMIPS_GPIO_P0_OUT + (port * 0xC)) & ~(1 << pin),
@@ -188,7 +188,8 @@ int ifxmips_port_clear_output(unsigned int port, unsigned int pin)
 }
 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;
 	if (ifxmips_r32(IFXMIPS_GPIO_P0_IN + (port * 0xC)) & (1 << pin))
@@ -198,7 +199,8 @@ int 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_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC)) | (1 << pin),
@@ -207,7 +209,8 @@ int ifxmips_port_set_altsel0(unsigned int port, unsigned int pin)
 }
 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_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC)) & ~(1 << pin),
@@ -216,7 +219,8 @@ int ifxmips_port_clear_altsel0(unsigned int port, unsigned int pin)
 }
 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_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC)) | (1 << pin),
@@ -225,7 +229,8 @@ int ifxmips_port_set_altsel1(unsigned int port, unsigned int pin)
 }
 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_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC)) & ~(1 << pin),
@@ -234,105 +239,85 @@ int 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 void
+ifxmips_gpio_set(struct gpio_chip *chip, unsigned int offset, int value)
 {
-	char *scratch;
-	scratch = skb_put(skb, strlen(msg) + 1);
-	sprintf(scratch, msg);
+	int port = GPIO_TO_PORT(offset);
+	int gpio = GPIO_TO_GPIO(offset);
+	if(value)
+		ifxmips_port_set_output(port, gpio);
+	else
+		ifxmips_port_clear_output(port, gpio);
 }
 
-static void hotplug_button(struct work_struct *wq)
+static int
+ifxmips_gpio_get(struct gpio_chip *chip, unsigned int offset)
 {
-	struct sk_buff *skb;
-	struct event_t *event;
-	size_t len;
-	char *scratch, *s;
-	char buf[128];
-
-	event = container_of(wq, struct event_t, wq);
-	if (!uevent_sock)
-		goto done;
-
-	s = event->set ? "pressed" : "released";
-	len = strlen(s) + 2;
-	skb = alloc_skb(len + 2048, GFP_KERNEL);
-	if (!skb)
-		goto done;
-
-	scratch = skb_put(skb, len);
-	sprintf(scratch, "%s@", s);
-	add_msg(skb, "HOME=/");
-	add_msg(skb, "PATH=/sbin:/bin:/usr/sbin:/usr/bin");
-	add_msg(skb, "SUBSYSTEM=button");
-	add_msg(skb, "BUTTON=reset");
-	add_msg(skb, (event->set ? "ACTION=pressed" : "ACTION=released"));
-	sprintf(buf, "SEEN=%ld", (event->jiffies - seen)/HZ);
-	add_msg(skb, buf);
-	snprintf(buf, 128, "SEQNUM=%llu", uevent_next_seqnum());
-	add_msg(skb, buf);
-
-	NETLINK_CB(skb).dst_group = 1;
-	netlink_broadcast(uevent_sock, skb, 0, 1, GFP_KERNEL);
-done:
-	kfree(event);
+	int port = GPIO_TO_PORT(offset);
+	int gpio = GPIO_TO_GPIO(offset);
+	return ifxmips_port_get_input(port, gpio);
 }
 
-static void reset_button_poll(unsigned long unused)
+static int
+ifxmips_gpio_direction_input(struct gpio_chip *chip, unsigned int offset)
 {
-	struct event_t *event;
-
-	rst_button_timer.expires = jiffies + (HZ / 4);
-	add_timer(&rst_button_timer);
-
-	if (pressed != ifxmips_port_get_input(rst_port, rst_pin)) {
-		if (pressed)
-			pressed = 0;
-		else
-			pressed = 1;
-		event = kzalloc(sizeof(struct event_t), GFP_ATOMIC);
-		if (!event) {
-			printk(KERN_INFO "Could not alloc hotplug event\n");
-			return;
-		}
-		event->set = pressed;
-		event->jiffies = jiffies;
-		INIT_WORK(&event->wq, (void *)(void *)hotplug_button);
-		schedule_work(&event->wq);
-		seen = jiffies;
-	}
+	int port = GPIO_TO_PORT(offset);
+	int gpio = GPIO_TO_GPIO(offset);
+	ifxmips_port_set_open_drain(port, gpio);
+	ifxmips_port_clear_altsel0(port, gpio);
+	ifxmips_port_clear_altsel1(port, gpio);
+	ifxmips_port_set_dir_in(port, gpio);
+	return 0;
 }
-#endif
 
-static int ifxmips_gpio_probe(struct platform_device *dev)
+static int
+ifxmips_gpio_direction_output(struct gpio_chip *chip, unsigned int offset, int value)
 {
-	int retval = 0;
-
-#ifdef CONFIG_IFXMIPS_GPIO_RST_BTN
-	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;
-	rst_button_timer.expires = jiffies + HZ;
-	add_timer(&rst_button_timer);
-#endif
-	return retval;
+	int port = GPIO_TO_PORT(offset);
+	int gpio = GPIO_TO_GPIO(offset);
+	ifxmips_port_clear_open_drain(port, gpio);
+	ifxmips_port_clear_altsel0(port, gpio);
+	ifxmips_port_clear_altsel1(port, gpio);
+	ifxmips_port_set_dir_out(port, gpio);
+	ifxmips_gpio_set(chip, offset, value);
+	return 0;
+}
+
+int
+gpio_to_irq(unsigned int gpio)
+{
+	return -EINVAL;
+}
+EXPORT_SYMBOL(gpio_to_irq);
+
+struct gpio_chip
+ifxmips_gpio_chip =
+{
+	.label = "ifxmips-gpio",
+	.direction_input = ifxmips_gpio_direction_input,
+	.direction_output = ifxmips_gpio_direction_output,
+	.get = ifxmips_gpio_get,
+	.set = ifxmips_gpio_set,
+	.base = 0,
+	.ngpio = 32,
+};
+
+static int
+ifxmips_gpio_probe(struct platform_device *dev)
+{
+	gpiochip_add(&ifxmips_gpio_chip);
+	return 0;
 }
 
-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);
-#endif
+	gpiochip_remove(&ifxmips_gpio_chip);
 	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 = {
@@ -341,7 +326,8 @@ static struct 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)
@@ -349,7 +335,8 @@ int __init ifxmips_gpio_init(void)
 	return ret;
 }
 
-void __exit ifxmips_gpio_exit(void)
+void __exit
+ifxmips_gpio_exit(void)
 {
 	platform_driver_unregister(&ifxmips_gpio_driver);
 }
diff --git a/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/gpio.h b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/gpio.h
deleted file mode 100644
index 4176bfd809..0000000000
--- a/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/gpio.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *   include/asm-mips/mach-ifxmips/gpio.h
- *
- *   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.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- *   Copyright (C) 2007 John Crispin <blogic@openwrt.org>
- *
- */
-
-#ifndef _IFXMIPS_GPIO_H_
-#define _IFXMIPS_GPIO_H_
-
-#include <ifxmips.h>
-#include <ifxmips_gpio.h>
-
-#define GPIO_TO_PORT(x) ((x > 15) ? (1) : (0))
-#define GPIO_TO_GPIO(x) ((x > 15) ? (x-16) : (x))
-
-static inline int gpio_direction_input(unsigned gpio)
-{
-	ifxmips_port_set_open_drain(GPIO_TO_PORT(gpio), GPIO_TO_GPIO(gpio));
-	ifxmips_port_clear_altsel0(GPIO_TO_PORT(gpio), GPIO_TO_GPIO(gpio));
-	ifxmips_port_clear_altsel1(GPIO_TO_PORT(gpio), GPIO_TO_GPIO(gpio));
-	ifxmips_port_set_dir_in(GPIO_TO_PORT(gpio), GPIO_TO_GPIO(gpio));
-	return 0;
-}
-
-static inline int gpio_direction_output(unsigned gpio, int value)
-{
-	ifxmips_port_clear_open_drain(GPIO_TO_PORT(gpio), GPIO_TO_GPIO(gpio));
-	ifxmips_port_clear_altsel0(GPIO_TO_PORT(gpio), GPIO_TO_GPIO(gpio));
-	ifxmips_port_clear_altsel1(GPIO_TO_PORT(gpio), GPIO_TO_GPIO(gpio));
-	ifxmips_port_set_dir_out(GPIO_TO_PORT(gpio), GPIO_TO_GPIO(gpio));
-	return 0;
-}
-
-static inline int gpio_get_value(unsigned gpio)
-{
-	ifxmips_port_get_input(GPIO_TO_PORT(gpio), GPIO_TO_GPIO(gpio));
-	return 0;
-}
-
-static inline void gpio_set_value(unsigned gpio, int value)
-{
-	if (value)
-		ifxmips_port_set_output(GPIO_TO_PORT(gpio), GPIO_TO_GPIO(gpio));
-	else
-		ifxmips_port_clear_output(GPIO_TO_PORT(gpio),
-			GPIO_TO_GPIO(gpio));
-}
-
-static inline int gpio_request(unsigned gpio, const char *label)
-{
-	return 0;
-}
-
-static inline void gpio_free(unsigned gpio)
-{
-}
-
-static inline int gpio_to_irq(unsigned gpio)
-{
-	return 0;
-}
-
-static inline int irq_to_gpio(unsigned irq)
-{
-	return 0;
-}
-
-static inline int gpio_cansleep(unsigned gpio)
-{
-	return 0;
-}
-
-static inline int gpio_get_value_cansleep(unsigned gpio)
-{
-	might_sleep();
-	return gpio_get_value(gpio);
-}
-
-static inline void gpio_set_value_cansleep(unsigned gpio, int value)
-{
-	might_sleep();
-	gpio_set_value(gpio, value);
-}
-
-static inline int gpio_is_valid(int number)
-{
-	return ((unsigned)number) < 32;
-}
-
-#endif
diff --git a/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_irq.h b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_irq.h
index f3cb99c2bb..e6ca59baf9 100644
--- a/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_irq.h
+++ b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_irq.h
@@ -66,8 +66,11 @@
 
 #define IFXMIPS_PPE_MBOX_INT		(INT_NUM_IM2_IRL0 + 24)
 
-#define IFXMIPS_USB_INT			(INT_NUM_IM4_IRL0 + 22)
-#define IFXMIPS_USB_OC_INT		(INT_NUM_IM4_IRL0 + 23)
+#define INT_NUM_IM4_IRL14			(INT_NUM_IM4_IRL0 + 14)
+#define INT_NUM_IM4_IRL18			(INT_NUM_IM4_IRL0 + 18)
+#define INT_NUM_IM4_IRL19			(INT_NUM_IM4_IRL0 + 19)
+#define IFXMIPS_USB_INT				(INT_NUM_IM4_IRL0 + 22)
+#define IFXMIPS_USB_OC_INT			(INT_NUM_IM4_IRL0 + 23)
 
 
 extern void ifxmips_mask_and_ack_irq(unsigned int irq_nr);