X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c164e9d4b74927f374544ee61d4315780974b486..2b27796714eb05d8ee1875b36b48b81fb0cf9e5f:/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/gpio.h

diff --git a/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/gpio.h b/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/gpio.h
index 3083b8811..92adc4848 100644
--- a/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/gpio.h
+++ b/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/gpio.h
@@ -1,5 +1,5 @@
 /*
- *   include/asm-mips/mach-ifxmips/gpio.h 
+ *   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
@@ -15,60 +15,91 @@
  *   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> 
+ *   Copyright (C) 2007 John Crispin <blogic@openwrt.org>
  *
  */
 
-
 #ifndef _IFXMIPS_GPIO_H_
 #define _IFXMIPS_GPIO_H_
 
 #include <asm/ifxmips/ifxmips.h>
+#include <asm/ifxmips/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_dir_in(0, gpio);
+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_set_dir_out(0, gpio);
+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(0, gpio);
+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) {
-	ifxmips_port_set_output(0, gpio);
+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) {
+static inline int gpio_request(unsigned gpio, const char *label)
+{
 	return 0;
 }
 
-static inline void gpio_free(unsigned gpio) {
+static inline void gpio_free(unsigned gpio)
+{
 }
 
-static inline int gpio_to_irq(unsigned gpio) {
+static inline int gpio_to_irq(unsigned gpio)
+{
 	return 0;
 }
 
-static inline int irq_to_gpio(unsigned irq) {
+static inline int irq_to_gpio(unsigned irq)
+{
 	return 0;
 }
 
-static inline int gpio_cansleep(unsigned gpio) {
-        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 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 void gpio_set_value_cansleep(unsigned gpio, int value)
+{
+	might_sleep();
+	gpio_set_value(gpio, value);
 }
 
-#endif
+static inline int gpio_is_valid(int number)
+{
+	return ((unsigned)number) < 8;
+}
 
+#endif