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
This commit is contained in:
Florian Fainelli 2008-09-09 09:20:50 +00:00
parent 8dc12e9096
commit ae253edfbe

View file

@ -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;
}