ux500: rework gpio registration

Rework gpio registration to remove build-time
changing macros.

Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>

1 files changed, 24 insertions, 9 deletions

diff --git a/arch/arm/mach-ux500/cpu-db5500.c b/arch/arm/mach-ux500/cpu-db5500.c
index 8816844d7e4..acc841e48de 100644
--- a/arch/arm/mach-ux500/cpu-db5500.c
+++ b/arch/arm/mach-ux500/cpu-db5500.c
@@ -12,6 +12,8 @@
 
 #include <asm/mach/map.h>
 
+#include <plat/gpio.h>
+
 #include <mach/hardware.h>
 #include <mach/devices.h>
 #include <mach/setup.h>
@@ -113,19 +115,32 @@ static struct platform_device mbox2_device = {
 };
 
 static struct platform_device *u5500_platform_devs[] __initdata = {
-        &u5500_gpio_devs[0],
-        &u5500_gpio_devs[1],
-        &u5500_gpio_devs[2],
-        &u5500_gpio_devs[3],
-        &u5500_gpio_devs[4],
-        &u5500_gpio_devs[5],
-        &u5500_gpio_devs[6],
-        &u5500_gpio_devs[7],
         &mbox0_device,
         &mbox1_device,
         &mbox2_device,
 };
 
+static resource_size_t __initdata db5500_gpio_base[] = {
+        U5500_GPIOBANK0_BASE,
+        U5500_GPIOBANK1_BASE,
+        U5500_GPIOBANK2_BASE,
+        U5500_GPIOBANK3_BASE,
+        U5500_GPIOBANK4_BASE,
+        U5500_GPIOBANK5_BASE,
+        U5500_GPIOBANK6_BASE,
+        U5500_GPIOBANK7_BASE,
+};
+
+static void __init db5500_add_gpios(void)
+{
+        struct nmk_gpio_platform_data pdata = {
+                /* No custom data yet */
+        };
+
+        dbx500_add_gpios(ARRAY_AND_SIZE(db5500_gpio_base),
+                         IRQ_DB5500_GPIO0, &pdata);
+}
+
 void __init u5500_map_io(void)
 {
         ux500_map_io();
@@ -135,8 +150,8 @@ void __init u5500_map_io(void)
 
 void __init u5500_init_devices(void)
 {
+        db5500_add_gpios();
         db5500_dma_init();
-
         db5500_add_rtc();
 
         platform_add_devices(u5500_platform_devs,