aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/reset.c
diff options
context:
space:
mode:
authorDaniel Ribeiro <drwyrm@gmail.com>2009-05-05 22:43:18 -0300
committerEric Miao <eric.miao@marvell.com>2009-05-18 21:52:09 +0800
commit216e3b7abbd05c35d2d1a3f86629ade485351f0d (patch)
treefe89595dba787748fe311721cebd6a6101255752 /arch/arm/mach-pxa/reset.c
parent818bc814447a35350ae90a329133e474bf1a2bd7 (diff)
downloadkernel_samsung_aries-216e3b7abbd05c35d2d1a3f86629ade485351f0d.zip
kernel_samsung_aries-216e3b7abbd05c35d2d1a3f86629ade485351f0d.tar.gz
kernel_samsung_aries-216e3b7abbd05c35d2d1a3f86629ade485351f0d.tar.bz2
[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: Daniel Ribeiro <drwyrm@gmail.com> Acked-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/reset.c')
-rw-r--r--arch/arm/mach-pxa/reset.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/reset.c b/arch/arm/mach-pxa/reset.c
index df29d45..01e9d64 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 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) {