ARM: OMAP1: Move 16xx GPIO system clock to platform init code

This way we can remove omap_read/write call from the GPIO driver
and remove include to linux/io.h.

Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap1/gpio16xx.c b/arch/arm/mach-omap1/gpio16xx.c
index 0f399bd0e70e7be70ee1eebc2603f8f877c63f4f..99cabc498ab59b6cbd4e7fb7a354138d3a2698e5 100644 (file)
--- a/arch/arm/mach-omap1/gpio16xx.c
+++ b/arch/arm/mach-omap1/gpio16xx.c
@@ -218,6 +218,13 @@ static int __init omap16xx_gpio_init(void)
        if (!cpu_is_omap16xx())
                return -EINVAL;
 
+       /*
+        * Enable system clock for GPIO module.
+        * The CAM_CLK_CTRL *is* really the right place.
+        */
+       omap_writel(omap_readl(ULPD_CAM_CLK_CTRL) | 0x04,
+                                       ULPD_CAM_CLK_CTRL);
+
        for (i = 0; i < ARRAY_SIZE(omap16xx_gpio_dev); i++)
                platform_device_register(omap16xx_gpio_dev[i]);
 

diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 0b0562979171065bb3c454112c985cb74a633728..5b7b164e08ad8bae89c9359744962559d4afa975 100644 (file)
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1064,13 +1064,6 @@ static void omap_gpio_mod_init(struct gpio_bank *bank, int id)
                                                + OMAP1610_GPIO_IRQSTATUS1);
                        __raw_writew(0x0014, bank->base
                                                + OMAP1610_GPIO_SYSCONFIG);
-
-                       /*
-                        * Enable system clock for GPIO module.
-                        * The CAM_CLK_CTRL *is* really the right place.
-                        */
-                       omap_writel(omap_readl(ULPD_CAM_CLK_CTRL) | 0x04,
-                                               ULPD_CAM_CLK_CTRL);
                }
                if (cpu_is_omap7xx() && bank->method == METHOD_GPIO_7XX) {
                        __raw_writel(0xffffffff, bank->base