Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44ce1719 authored by Bruno Randolf's avatar Bruno Randolf Committed by Ralf Baechle
Browse files

[MIPS] au1000: Fix gpio direction 



When setting the direction 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.

Signed-off-by: default avatarBruno Randolf <br1@einfach.org>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent fb478da5

arch/mips/au1000/common/gpio.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -61,7 +61,8 @@ static int au1xxx_gpio2_direction_input(unsigned gpio) 
static int au1xxx_gpio2_direction_output(unsigned gpio, int value)

static int au1xxx_gpio2_direction_output(unsigned gpio, int value)

{

{

	gpio -= AU1XXX_GPIO_BASE;

	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;

	return 0;

}

}
@@ -90,6 +91,7 @@ static int au1xxx_gpio1_direction_input(unsigned gpio) 
static int au1xxx_gpio1_direction_output(unsigned gpio, int value)

static int au1xxx_gpio1_direction_output(unsigned gpio, int value)

{

{

	gpio1->trioutclr = (0x01 & gpio);

	gpio1->trioutclr = (0x01 & gpio);

	au1xxx_gpio1_write(gpio, value);

	return 0;

	return 0;

}

}