ARM: Remove dependency of plat-orion GPIO code on mach directory includes.

This patch makes the various mach dirs that use the plat-orion GPIO
code pass in GPIO-related platform info (GPIO controller base address,
secondary base IRQ number, etc) explicitly, instead of having
plat-orion get those values by including a mach dir include file --
the latter mechanism is problematic if you want to support multiple
ARM platforms in the same kernel image.

Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>

4 files changed, 3 insertions, 48 deletions

diff --git a/arch/arm/mach-orion5x/include/mach/gpio.h b/arch/arm/mach-orion5x/include/mach/gpio.h
index d8182e87ac16..a1d0b78decb1 100644
--- a/arch/arm/mach-orion5x/include/mach/gpio.h
+++ b/arch/arm/mach-orion5x/include/mach/gpio.h
@@ -6,32 +6,4 @@
  * warranty of any kind, whether express or implied.
  */
 
-#ifndef __ASM_ARCH_GPIO_H
-#define __ASM_ARCH_GPIO_H
-
-#include <mach/irqs.h>
 #include <plat/gpio.h>
-#include <asm-generic/gpio.h>           /* cansleep wrappers */
-
-#define GPIO_MAX                32
-#define GPIO_OUT(pin)           ORION5X_DEV_BUS_REG(0x100)
-#define GPIO_IO_CONF(pin)       ORION5X_DEV_BUS_REG(0x104)
-#define GPIO_BLINK_EN(pin)      ORION5X_DEV_BUS_REG(0x108)
-#define GPIO_IN_POL(pin)        ORION5X_DEV_BUS_REG(0x10c)
-#define GPIO_DATA_IN(pin)       ORION5X_DEV_BUS_REG(0x110)
-#define GPIO_EDGE_CAUSE(pin)    ORION5X_DEV_BUS_REG(0x114)
-#define GPIO_EDGE_MASK(pin)     ORION5X_DEV_BUS_REG(0x118)
-#define GPIO_LEVEL_MASK(pin)    ORION5X_DEV_BUS_REG(0x11c)
-
-static inline int gpio_to_irq(int pin)
-{
-        return pin + IRQ_ORION5X_GPIO_START;
-}
-
-static inline int irq_to_gpio(int irq)
-{
-        return irq - IRQ_ORION5X_GPIO_START;
-}
-
-
-#endif
diff --git a/arch/arm/mach-orion5x/include/mach/orion5x.h b/arch/arm/mach-orion5x/include/mach/orion5x.h
index 2d8766570531..0a28bbc76891 100644
--- a/arch/arm/mach-orion5x/include/mach/orion5x.h
+++ b/arch/arm/mach-orion5x/include/mach/orion5x.h
@@ -73,6 +73,7 @@
 #define ORION5X_DEV_BUS_PHYS_BASE       (ORION5X_REGS_PHYS_BASE | 0x10000)
 #define ORION5X_DEV_BUS_VIRT_BASE       (ORION5X_REGS_VIRT_BASE | 0x10000)
 #define ORION5X_DEV_BUS_REG(x)          (ORION5X_DEV_BUS_VIRT_BASE | (x))
+#define  GPIO_VIRT_BASE                 ORION5X_DEV_BUS_REG(0x0100)
 #define  SPI_PHYS_BASE                  (ORION5X_DEV_BUS_PHYS_BASE | 0x0600)
 #define  I2C_PHYS_BASE                  (ORION5X_DEV_BUS_PHYS_BASE | 0x1000)
 #define  UART0_PHYS_BASE                (ORION5X_DEV_BUS_PHYS_BASE | 0x2000)
diff --git a/arch/arm/mach-orion5x/irq.c b/arch/arm/mach-orion5x/irq.c
index d7512b925a85..ed85891f8699 100644
--- a/arch/arm/mach-orion5x/irq.c
+++ b/arch/arm/mach-orion5x/irq.c
@@ -28,27 +28,12 @@ static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
 
 void __init orion5x_init_irq(void)
 {
-        int i;
-
         orion_irq_init(0, (void __iomem *)MAIN_IRQ_MASK);
 
         /*
-         * Mask and clear GPIO IRQ interrupts
-         */
-        writel(0x0, GPIO_LEVEL_MASK(0));
-        writel(0x0, GPIO_EDGE_MASK(0));
-        writel(0x0, GPIO_EDGE_CAUSE(0));
-
-        /*
-         * Register chained level handlers for GPIO IRQs by default.
-         * User can use set_type() if he wants to use edge types handlers.
+         * Initialize gpiolib for GPIOs 0-31.
          */
-        for (i = IRQ_ORION5X_GPIO_START; i < NR_IRQS; i++) {
-                set_irq_chip(i, &orion_gpio_irq_chip);
-                set_irq_handler(i, handle_level_irq);
-                irq_desc[i].status |= IRQ_LEVEL;
-                set_irq_flags(i, IRQF_VALID);
-        }
+        orion_gpio_init(0, 32, GPIO_VIRT_BASE, 0, IRQ_ORION5X_GPIO_START);
         set_irq_chained_handler(IRQ_ORION5X_GPIO_0_7, gpio_irq_handler);
         set_irq_chained_handler(IRQ_ORION5X_GPIO_8_15, gpio_irq_handler);
         set_irq_chained_handler(IRQ_ORION5X_GPIO_16_23, gpio_irq_handler);
diff --git a/arch/arm/mach-orion5x/mpp.c b/arch/arm/mach-orion5x/mpp.c
index db485d3b8144..2288207726e4 100644
--- a/arch/arm/mach-orion5x/mpp.c
+++ b/arch/arm/mach-orion5x/mpp.c
@@ -124,9 +124,6 @@ void __init orion5x_mpp_conf(struct orion5x_mpp_mode *mode)
         u32 mpp_8_15_ctrl = readl(MPP_8_15_CTRL);
         u32 mpp_16_19_ctrl = readl(MPP_16_19_CTRL);
 
-        /* Initialize gpiolib. */
-        orion_gpio_init();
-
         for ( ; mode->mpp >= 0; mode++) {
                 u32 *reg;
                 int num_type;