ARM: clps711x: Re-add GPIO support

arch_initcall was been removed from GPIO driver, so this patch
re-add support for GPIO into boards as platform_device.
Since some drivers (spi, nand, etc.) is not support deferred probe,
separate machine init calls is used in board code to make proper
loading sequence.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/mach-clps711x/Makefile b/arch/arm/mach-clps711x/Makefile
index 992995af666a58e9b0f4af3c4127dff55476eba4..f30ed2b496fba6caf98a6c633d70af4ca43ff1ab 100644 (file)
--- a/arch/arm/mach-clps711x/Makefile
+++ b/arch/arm/mach-clps711x/Makefile
@@ -4,10 +4,7 @@
 
 # Object file lists.
 
-obj-y                  := common.o
-obj-m                  :=
-obj-n                  :=
-obj-                   :=
+obj-y                          := common.o devices.o
 
 obj-$(CONFIG_ARCH_AUTCPU12)    += board-autcpu12.o
 obj-$(CONFIG_ARCH_CDB89712)    += board-cdb89712.o

diff --git a/arch/arm/mach-clps711x/board-autcpu12.c b/arch/arm/mach-clps711x/board-autcpu12.c
index f38584709df7738ce629de8b3e063317909f6363..1e22cb4726bee58e2aa03a83ed0f11a9754f516e 100644 (file)
--- a/arch/arm/mach-clps711x/board-autcpu12.c
+++ b/arch/arm/mach-clps711x/board-autcpu12.c
@@ -43,6 +43,7 @@
 #include <mach/autcpu12.h>
 
 #include "common.h"
+#include "devices.h"
 
 #define AUTCPU12_CS8900_BASE   (CS2_PHYS_BASE + 0x300)
 #define AUTCPU12_CS8900_IRQ    (IRQ_EINT3)
@@ -149,6 +150,7 @@ static struct platform_device autcpu12_mmgpio_pdev __initdata = {
 
 static void __init autcpu12_init(void)
 {
+       clps711x_devices_init();
        platform_device_register_simple("video-clps711x", 0, NULL, 0);
        platform_device_register_simple("cs89x0", 0, autcpu12_cs8900_resource,
                                        ARRAY_SIZE(autcpu12_cs8900_resource));

diff --git a/arch/arm/mach-clps711x/board-cdb89712.c b/arch/arm/mach-clps711x/board-cdb89712.c
index baab7da33c9b62b1351d43ae9be6e953c8fb7446..a80ae57743fbc01b09c2d553e44dfe93b8a44d7c 100644 (file)
--- a/arch/arm/mach-clps711x/board-cdb89712.c
+++ b/arch/arm/mach-clps711x/board-cdb89712.c
@@ -39,6 +39,7 @@
 #include <asm/mach/map.h>
 
 #include "common.h"
+#include "devices.h"
 
 #define CDB89712_CS8900_BASE   (CS2_PHYS_BASE + 0x300)
 #define CDB89712_CS8900_IRQ    (IRQ_EINT3)
@@ -127,6 +128,7 @@ static struct platform_device cdb89712_sram_pdev __initdata = {
 
 static void __init cdb89712_init(void)
 {
+       clps711x_devices_init();
        platform_device_register(&cdb89712_flash_pdev);
        platform_device_register(&cdb89712_bootrom_pdev);
        platform_device_register(&cdb89712_sram_pdev);

diff --git a/arch/arm/mach-clps711x/board-edb7211.c b/arch/arm/mach-clps711x/board-edb7211.c
index 5f928e9ed2efdfd5e665eac6f8e0224dc1c3e3a1..e1c5573e92cba29919b5d6a56d108fb396d4e9f6 100644 (file)
--- a/arch/arm/mach-clps711x/board-edb7211.c
+++ b/arch/arm/mach-clps711x/board-edb7211.c
@@ -29,6 +29,7 @@
 #include <mach/hardware.h>
 
 #include "common.h"
+#include "devices.h"
 
 #define VIDEORAM_SIZE          SZ_128K
 
@@ -150,6 +151,11 @@ fixup_edb7211(struct tag *tags, char **cmdline, struct meminfo *mi)
 }
 
 static void __init edb7211_init(void)
+{
+       clps711x_devices_init();
+}
+
+static void __init edb7211_init_late(void)
 {
        gpio_request_array(edb7211_gpios, ARRAY_SIZE(edb7211_gpios));
 
@@ -175,6 +181,7 @@ MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")
        .init_irq       = clps711x_init_irq,
        .init_time      = clps711x_timer_init,
        .init_machine   = edb7211_init,
+       .init_late      = edb7211_init_late,
        .handle_irq     = clps711x_handle_irq,
        .restart        = clps711x_restart,
 MACHINE_END

diff --git a/arch/arm/mach-clps711x/board-p720t.c b/arch/arm/mach-clps711x/board-p720t.c
index 8d3ee67711356c6da73c701c0e52c47540f370a2..48d073716eb8cff568e3c0cff9b7e521e0a1408b 100644 (file)
--- a/arch/arm/mach-clps711x/board-p720t.c
+++ b/arch/arm/mach-clps711x/board-p720t.c
@@ -43,6 +43,7 @@
 #include <video/platform_lcd.h>
 
 #include "common.h"
+#include "devices.h"
 
 #define P720T_USERLED          CLPS711X_GPIO(3, 0)
 #define P720T_NAND_CLE         CLPS711X_GPIO(4, 0)
@@ -198,6 +199,11 @@ static struct gpio_led_platform_data p720t_gpio_led_pdata __initdata = {
 };
 
 static void __init p720t_init(void)
+{
+       clps711x_devices_init();
+}
+
+static void __init p720t_init_late(void)
 {
        platform_device_register(&p720t_nand_pdev);
        platform_device_register_data(&platform_bus, "platform-lcd", 0,
@@ -207,10 +213,6 @@ static void __init p720t_init(void)
                                      &p720t_lcd_backlight_pdata,
                                      sizeof(p720t_lcd_backlight_pdata));
        platform_device_register_simple("video-clps711x", 0, NULL, 0);
-}
-
-static void __init p720t_init_late(void)
-{
        platform_device_register_data(&platform_bus, "leds-gpio", 0,
                                      &p720t_gpio_led_pdata,
                                      sizeof(p720t_gpio_led_pdata));

diff --git a/arch/arm/mach-clps711x/devices.c b/arch/arm/mach-clps711x/devices.c
new file mode 100644 (file)
index 0000000..21161ed
--- /dev/null
+++ b/arch/arm/mach-clps711x/devices.c
@@ -0,0 +1,48 @@
+/*
+ *  CLPS711X common devices definitions
+ *
+ *  Author: Alexander Shiyan <shc_work@mail.ru>, 2013
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/platform_device.h>
+
+#include <mach/hardware.h>
+
+static const phys_addr_t clps711x_gpios[][2] __initconst = {
+       { PADR, PADDR },
+       { PBDR, PBDDR },
+       { PCDR, PCDDR },
+       { PDDR, PDDDR },
+       { PEDR, PEDDR },
+};
+
+static void __init clps711x_add_gpio(void)
+{
+       unsigned i;
+       struct resource gpio_res[2];
+
+       memset(gpio_res, 0, sizeof(gpio_res));
+
+       gpio_res[0].flags = IORESOURCE_MEM;
+       gpio_res[1].flags = IORESOURCE_MEM;
+
+       for (i = 0; i < ARRAY_SIZE(clps711x_gpios); i++) {
+               gpio_res[0].start = CLPS711X_PHYS_BASE + clps711x_gpios[i][0];
+               gpio_res[0].end = gpio_res[0].start;
+               gpio_res[1].start = CLPS711X_PHYS_BASE + clps711x_gpios[i][1];
+               gpio_res[1].end = gpio_res[1].start;
+
+               platform_device_register_simple("clps711x-gpio", i,
+                                               gpio_res, ARRAY_SIZE(gpio_res));
+       }
+}
+
+void __init clps711x_devices_init(void)
+{
+       clps711x_add_gpio();
+}

diff --git a/arch/arm/mach-clps711x/devices.h b/arch/arm/mach-clps711x/devices.h
new file mode 100644 (file)
index 0000000..a5efc17
--- /dev/null
+++ b/arch/arm/mach-clps711x/devices.h
@@ -0,0 +1,12 @@
+/*
+ *  CLPS711X common devices definitions
+ *
+ *  Copyright (C) 2013 Alexander Shiyan <shc_work@mail.ru>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+void clps711x_devices_init(void);