au1000: fix gpio output
authorFlorian Fainelli <florian@openwrt.org>
Tue, 9 Sep 2008 09:20:50 +0000 (09:20 +0000)
committerFlorian Fainelli <florian@openwrt.org>
Tue, 9 Sep 2008 09:20:50 +0000 (09:20 +0000)
when setting the output state of one GPIO pin we have to keep the state of the
other pins, hence use binary OR. also gpio_direction_output() wants to set an
initial value, so add that too.

this fixes a problem with the USB power switch on mtx-1 boards. (#3974)

Signed-off-by: Bruno Randolf <br1@einfach.org>
SVN-Revision: 12561

target/linux/au1000/patches/017-gpio-dir.patch [new file with mode: 0644]

diff --git a/target/linux/au1000/patches/017-gpio-dir.patch b/target/linux/au1000/patches/017-gpio-dir.patch
new file mode 100644 (file)
index 0000000..c499d38
--- /dev/null
@@ -0,0 +1,20 @@
+--- linux-2.6.25.16/arch/mips/au1000/common/gpio.c.org 2008-09-04 22:32:12.000000000 +0200
++++ linux-2.6.25.16/arch/mips/au1000/common/gpio.c     2008-09-04 23:10:18.000000000 +0200
+@@ -66,7 +66,8 @@
+ static int au1xxx_gpio2_direction_output(unsigned gpio, int value)
+ {
+       gpio -= AU1XXX_GPIO_BASE;
+-      gpio2->dir = (0x01 << gpio) | (value << gpio);
++      gpio2->dir |= 0x01 << gpio;
++      gpio2->output = (GPIO2_OUTPUT_ENABLE_MASK << gpio) | (value << gpio);
+       return 0;
+ }
+@@ -95,6 +96,7 @@
+ static int au1xxx_gpio1_direction_output(unsigned gpio, int value)
+ {
+       gpio1->trioutclr = (0x01 & gpio);
++      au1xxx_gpio1_write(gpio, value);
+       return 0;
+ }