diff options
| author |   Dmitry Baryshkov <dbaryshkov@gmail.com> | 2008-10-09 16:58:13 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-11 09:52:38 +0100 |
| commit | 69fc7eed5f56bce15b239e5110de2575a6970df4 (patch) | |
| tree | def52983185ffcea4da23cb747f10ee39c1b3396 /arch/arm/mach-pxa/reset.c | |
| parent | Merge branch 'for-rmk' of git://git.marvell.com/orion (diff) | |
| download | linux-dev-69fc7eed5f56bce15b239e5110de2575a6970df4.tar.xz linux-dev-69fc7eed5f56bce15b239e5110de2575a6970df4.zip | |
[ARM] 5300/1: fixup spitz reset during boot
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>
Diffstat (limited to 'arch/arm/mach-pxa/reset.c')
| -rw-r--r-- | arch/arm/mach-pxa/reset.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/reset.c b/arch/arm/mach-pxa/reset.c index 31d78855aac8..1b2af575c40f 100644 --- a/arch/arm/mach-pxa/reset.c +++ b/arch/arm/mach-pxa/reset.c @@ -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; } |