aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/au1000
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2008-09-09 09:20:50 +0000
committerFlorian Fainelli <florian@openwrt.org>2008-09-09 09:20:50 +0000
commitae253edfbee3ada91ff5eda5e1c5dbb43a734700 (patch)
tree0b77f0903e402cbef21d8e967c34898746c71412 /target/linux/au1000
parent8dc12e90968482e35a25b4bfe8443586838f208c (diff)
downloadupstream-ae253edfbee3ada91ff5eda5e1c5dbb43a734700.tar.gz
upstream-ae253edfbee3ada91ff5eda5e1c5dbb43a734700.tar.bz2
upstream-ae253edfbee3ada91ff5eda5e1c5dbb43a734700.zip
au1000: fix gpio output
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
Diffstat (limited to 'target/linux/au1000')
-rw-r--r--target/linux/au1000/patches/017-gpio-dir.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/target/linux/au1000/patches/017-gpio-dir.patch b/target/linux/au1000/patches/017-gpio-dir.patch
new file mode 100644
index 0000000000..c499d38e72
--- /dev/null
+++ b/target/linux/au1000/patches/017-gpio-dir.patch
@@ -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;
+ }
+