summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-08-29 17:08:41 +0200
committerRalf Baechle <ralf@linux-mips.org>2010-10-29 20:08:46 +0200
commit3bc6968adc7b1926f4582a33a33ad42d9b302ce0 (patch)
tree67d37a08a426247ee059391c54bd363e542a4ca8 /arch/mips
parentMIPS: Add platform device and Kconfig for Octeon USB EHCI / OHCI (diff)
downloadlinux-3bc6968adc7b1926f4582a33a33ad42d9b302ce0.tar.xz
linux-3bc6968adc7b1926f4582a33a33ad42d9b302ce0.zip
MIPS: AR7: Initialize GPIO earlier
In order to detect the Titan variant, we must initialize GPIOs earlier since detection relies on some GPIO values to be set. Signed-off-by: Florian Fainelli <florian@openwrt.org> Patchwork: http://patchwork.linux-mips.org/patch/1562/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> ---
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/ar7/gpio.c3
-rw-r--r--arch/mips/ar7/prom.c2
-rw-r--r--arch/mips/include/asm/mach-ar7/ar7.h2
3 files changed, 5 insertions, 2 deletions
diff --git a/arch/mips/ar7/gpio.c b/arch/mips/ar7/gpio.c
index c32fbb57441a..f84834229dcf 100644
--- a/arch/mips/ar7/gpio.c
+++ b/arch/mips/ar7/gpio.c
@@ -107,7 +107,7 @@ int ar7_gpio_disable(unsigned gpio)
}
EXPORT_SYMBOL(ar7_gpio_disable);
-static int __init ar7_gpio_init(void)
+int __init ar7_gpio_init(void)
{
int ret;
@@ -128,4 +128,3 @@ static int __init ar7_gpio_init(void)
ar7_gpio_chip.chip.ngpio);
return ret;
}
-arch_initcall(ar7_gpio_init);
diff --git a/arch/mips/ar7/prom.c b/arch/mips/ar7/prom.c
index 52385790e5c1..23818d299127 100644
--- a/arch/mips/ar7/prom.c
+++ b/arch/mips/ar7/prom.c
@@ -246,6 +246,8 @@ void __init prom_init(void)
ar7_init_cmdline(fw_arg0, (char **)fw_arg1);
ar7_init_env((struct env_var *)fw_arg2);
console_config();
+
+ ar7_gpio_init();
}
#define PORT(offset) (KSEG1ADDR(AR7_REGS_UART0 + (offset * 4)))
diff --git a/arch/mips/include/asm/mach-ar7/ar7.h b/arch/mips/include/asm/mach-ar7/ar7.h
index 483ffea9ecb1..ddb413e81d06 100644
--- a/arch/mips/include/asm/mach-ar7/ar7.h
+++ b/arch/mips/include/asm/mach-ar7/ar7.h
@@ -161,4 +161,6 @@ static inline void ar7_device_off(u32 bit)
msleep(20);
}
+int __init ar7_gpio_init(void);
+
#endif /* __AR7_H__ */