[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>

diff --git a/arch/arm/mach-pxa/include/mach/reset.h b/arch/arm/mach-pxa/include/mach/reset.h
index 9489a48871a88a8196deb0bb001df9be2cebadb2..7b8842cfa5fce30753914f538a0d125d2d1a349d 100644 (file)
--- a/arch/arm/mach-pxa/include/mach/reset.h
+++ b/arch/arm/mach-pxa/include/mach/reset.h
@@ -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 */

diff --git a/arch/arm/mach-pxa/reset.c b/arch/arm/mach-pxa/reset.c
index 31d78855aac8824b637130a0e56248d08c4a50ec..1b2af575c40fdacb47cba208a450a27a99375e1f 100644 (file)
--- 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;
        }

diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index 9b4f24c7c055de37a2eedf97c2289e60a015f5a3..524f656dc56de561d11d4c467220d569380a2718 100644 (file)
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -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;
 

diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 9f3ef9eb32e37366d0ecf5d3b6e8d1abaada4fab..130e37e4ebdd2292aef62443a8614e89d8dd92bd 100644 (file)
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -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;