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

Commit 216e3b7a authored by Daniel Ribeiro's avatar Daniel Ribeiro Committed by Eric Miao
Browse files

[ARM] pxa: allow gpio_reset drive high during normal work 



I want to reuse tosa/spitz gpio_reset code, but my board needs the reset
gpio to be driven high during normal operation.

Signed-off-by: default avatarDaniel Ribeiro <drwyrm@gmail.com>
Acked-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
parent 818bc814

arch/arm/mach-pxa/include/mach/reset.h

+3 −2
Original line number Diff line number Diff line
@@ -13,8 +13,9 @@ extern void clear_reset_status(unsigned int mask); 
/**

 * init_gpio_reset() - register GPIO as reset generator

 * @gpio: gpio nr

 * @output: set gpio as out/low instead of input during normal work

 * @output: set gpio as output instead of input during normal work

 * @level: output level

 */

extern int init_gpio_reset(int gpio, int output);

extern int init_gpio_reset(int gpio, int output, int level);



#endif /* __ASM_ARCH_RESET_H */

arch/arm/mach-pxa/reset.c

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ static void do_hw_reset(void); 


static int reset_gpio = -1;



int init_gpio_reset(int gpio, int output)

int init_gpio_reset(int gpio, int output, int level)

{

	int rc;
@@ -31,7 +31,7 @@ int init_gpio_reset(int gpio, int output) 
	}



	if (output)

		rc = gpio_direction_output(gpio, 0);

		rc = gpio_direction_output(gpio, level);

	else

		rc = gpio_direction_input(gpio);

	if (rc) {

arch/arm/mach-pxa/spitz.c

+1 −1
Original line number Diff line number Diff line
@@ -731,7 +731,7 @@ static void spitz_restart(char mode, const char *cmd) 


static void __init common_init(void)

{

	init_gpio_reset(SPITZ_GPIO_ON_RESET, 1);

	init_gpio_reset(SPITZ_GPIO_ON_RESET, 1, 0);

	pm_power_off = spitz_poweroff;

	arm_pm_restart = spitz_restart;

arch/arm/mach-pxa/tosa.c

+1 −1
Original line number Diff line number Diff line
@@ -897,7 +897,7 @@ static void __init tosa_init(void) 
	gpio_set_wake(MFP_PIN_GPIO1, 1);

	/* We can't pass to gpio-keys since it will drop the Reset altfunc */



	init_gpio_reset(TOSA_GPIO_ON_RESET, 0);

	init_gpio_reset(TOSA_GPIO_ON_RESET, 0, 0);



	pm_power_off = tosa_poweroff;

	arm_pm_restart = tosa_restart;