This patch moves the gpiochip registration fro arch_initcall to
prom. This allows GPIO-based runtime board detection to be performed
earlier.
Original patch by Florian, changed to register gpio before calling
board_prom_init callback since we may want to use gpio inside it.
Signed-off-by: Florian Fainelli <florian@xxxxxxxxxxx>
Signed-off-by: Maxime Bizon <mbizon@xxxxxxxxxx>
---
arch/mips/bcm63xx/gpio.c | 3 +--
arch/mips/bcm63xx/prom.c | 4 ++++
arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h | 4 ++++
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/arch/mips/bcm63xx/gpio.c b/arch/mips/bcm63xx/gpio.c
index b78d3fd..997fcaa 100644
--- a/arch/mips/bcm63xx/gpio.c
+++ b/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/arch/mips/bcm63xx/prom.c b/arch/mips/bcm63xx/prom.c
index d97ceed..386cb9a 100644
--- a/arch/mips/bcm63xx/prom.c
+++ b/arch/mips/bcm63xx/prom.c
@@ -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)
{
@@ -38,6 +39,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/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
index 72cee75..7f5d8e8 100644
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
@@ -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
--
1.6.0.4
