iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ARM] 5300/1: fixup spitz reset during boot

Browse Source 
Some machines don't have the pullup/down on their reset
pin, so configuring the reset generating pin as input makes
them reset immediately. Fix that by making reset pin direction
configurable.

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Dmitry Baryshkov 2008-10-09 16:58:13 +01:00 committed by Russell King
parent 6defd90433
commit 69fc7eed5f
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/mach-pxa/include/mach/reset.h
View File

@ -10,9 +10,12 @@
extern unsigned int reset_status;
extern void clear_reset_status(unsigned int mask);
/*
* register GPIO as reset generator
/**
* init_gpio_reset() - register GPIO as reset generator
*
* @gpio - gpio nr
* @output - set gpio as out/low instead of input during normal work
*/
extern int init_gpio_reset(int gpio);
extern int init_gpio_reset(int gpio, int output);
#endif /* __ASM_ARCH_RESET_H */

9
arch/arm/mach-pxa/reset.c
View File

@ -20,7 +20,7 @@ static void do_hw_reset(void);
static int reset_gpio = -1;
int init_gpio_reset(int gpio)
int init_gpio_reset(int gpio, int output)
{
int rc;
@ -30,9 +30,12 @@ int init_gpio_reset(int gpio)
goto out;
}
rc = gpio_direction_input(gpio);
if (output)
rc = gpio_direction_output(gpio, 0);
else
rc = gpio_direction_input(gpio);
if (rc) {
printk(KERN_ERR "Can't configure reset_gpio for input\n");
printk(KERN_ERR "Can't configure reset_gpio\n");
gpio_free(gpio);
goto out;
}

2
arch/arm/mach-pxa/spitz.c
View File

@ -618,7 +618,7 @@ static void spitz_restart(char mode)
static void __init common_init(void)
{
init_gpio_reset(SPITZ_GPIO_ON_RESET);
init_gpio_reset(SPITZ_GPIO_ON_RESET, 1);
pm_power_off = spitz_poweroff;
arm_pm_restart = spitz_restart;

2
arch/arm/mach-pxa/tosa.c
View File

@ -781,7 +781,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);
init_gpio_reset(TOSA_GPIO_ON_RESET, 0);
pm_power_off = tosa_poweroff;
arm_pm_restart = tosa_restart;