OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>

---
This commit is contained in:
Florian Fainelli 2010-08-29 17:08:41 +02:00 committed by Ralf Baechle
parent 340fbb8b12
commit 3bc6968adc
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/mips/ar7/gpio.c
View File

@ -107,7 +107,7 @@ int ar7_gpio_disable(unsigned gpio)
} }
EXPORT_SYMBOL(ar7_gpio_disable); EXPORT_SYMBOL(ar7_gpio_disable);
static int __init ar7_gpio_init(void) int __init ar7_gpio_init(void)
{ {
int ret; int ret;
@ -128,4 +128,3 @@ static int __init ar7_gpio_init(void)
ar7_gpio_chip.chip.ngpio); ar7_gpio_chip.chip.ngpio);
return ret; return ret;
} }
arch_initcall(ar7_gpio_init);

2
arch/mips/ar7/prom.c
View File

@ -246,6 +246,8 @@ void __init prom_init(void)
ar7_init_cmdline(fw_arg0, (char **)fw_arg1); ar7_init_cmdline(fw_arg0, (char **)fw_arg1);
ar7_init_env((struct env_var *)fw_arg2); ar7_init_env((struct env_var *)fw_arg2);
console_config(); console_config();
ar7_gpio_init();
} }
#define PORT(offset) (KSEG1ADDR(AR7_REGS_UART0 + (offset * 4))) #define PORT(offset) (KSEG1ADDR(AR7_REGS_UART0 + (offset * 4)))

2
arch/mips/include/asm/mach-ar7/ar7.h
View File

@ -161,4 +161,6 @@ static inline void ar7_device_off(u32 bit)
msleep(20); msleep(20);
} }
int __init ar7_gpio_init(void);
#endif /* __AR7_H__ */ #endif /* __AR7_H__ */