From c95420f06d5d62fa91eb5ecdf6574d6da5262f3e Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Thu, 4 Jun 2009 09:59:28 +0000 Subject: [PATCH] register gpiochip earlier, allowing gpio-based runtime detection to be performed in board_init callback SVN-Revision: 16328 --- target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c | 3 +-- target/linux/brcm63xx/files/arch/mips/bcm63xx/prom.c | 4 ++++ .../files/include/asm-mips/mach-bcm63xx/bcm63xx_gpio.h | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c index b78d3fdafa1f..997fcaa439ba 100644 --- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c +++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c @@ -120,9 +120,8 @@ static struct gpio_chip bcm63xx_gpio_chip = { .ngpio = BCM63XX_GPIO_COUNT, }; -static int __init bcm63xx_gpio_init(void) +int __init bcm63xx_gpio_init(void) { printk(KERN_INFO "registering %d GPIOs\n", BCM63XX_GPIO_COUNT); return gpiochip_add(&bcm63xx_gpio_chip); } -arch_initcall(bcm63xx_gpio_init); diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/prom.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/prom.c index db0ef555a8ae..964a1479c6b6 100644 --- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/prom.c +++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/prom.c @@ -13,6 +13,7 @@ #include #include #include +#include void __init prom_init(void) { @@ -42,6 +43,9 @@ void __init prom_init(void) /* assign command line from kernel config */ strcpy(arcs_cmdline, CONFIG_CMDLINE); + /* register gpiochip */ + bcm63xx_gpio_init(); + /* do low level board init */ board_prom_init(); } diff --git a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_gpio.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_gpio.h index 72cee75f0a43..7f5d8e87d0f4 100644 --- a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_gpio.h +++ b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_gpio.h @@ -1,6 +1,10 @@ #ifndef BCM63XX_GPIO_H #define BCM63XX_GPIO_H +#include + +int __init bcm63xx_gpio_init(void); + /* all helpers will BUG() if gpio count is >= 37. */ #define BCM63XX_GPIO_COUNT 37 -- 2.30.2