bcm63xx: register gpiochip in prom
PATCH 1/1 bcm63xx: register gpiochip in prom
This patch moves the gpiochip registration fro arch_initcall to prom. This allows GPIO-based runtime board detection to be performed earlier.
Tested-by Maxime Bizon <[email protected]>
Signed-off-by Florian Fainelli <[email protected]>
---
arch/mips/bcm63xx/gpio.c +1 -2
@@ -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);
arch/mips/bcm63xx/prom.c +4 -0
@@ -13,6 +13,7 @@#include <bcm63xx_cpu.h> #include <bcm63xx_io.h> #include <bcm63xx_regs.h> +#include <bcm63xx_gpio.h> void __init prom_init (void ) {
@@ -40,6 +41,9 @@ void __init prom_init(void)/* do low level board init */ board_prom_init (); + +/* register gpiochip */ +bcm63xx_gpio_init (); }void __init prom_free_prom_memory (void )
arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h +4 -0
@@ -1,6 +1,10 @@#ifndef BCM63XX_GPIO_H #define BCM63XX_GPIO_H +#include <linux/init.h> + +int __init bcm63xx_gpio_init (void ); +/* all helpers will BUG() if gpio count is >= 37. */ #define BCM63XX_GPIO_COUNT 37