2 files changed, 7 insertions, 7 deletions

diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
index 776b34619901..bab6e470cbd7 100644
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@ -909,6 +909,13 @@ void __init ep93xx_init_devices(void)
         /* Disallow access to MaverickCrunch initially */
         ep93xx_devcfg_clear_bits(EP93XX_SYSCON_DEVCFG_CPENA);
 
+        /* Default all ports to GPIO */
+        ep93xx_devcfg_set_bits(EP93XX_SYSCON_DEVCFG_KEYS |
+                               EP93XX_SYSCON_DEVCFG_GONK |
+                               EP93XX_SYSCON_DEVCFG_EONIDE |
+                               EP93XX_SYSCON_DEVCFG_GONIDE |
+                               EP93XX_SYSCON_DEVCFG_HONIDE);
+
         /* Get the GPIO working early, other devices need it */
         platform_device_register(&ep93xx_gpio_device);
 
diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c
index 1c0fc3756cb1..4ca5642e9776 100644
--- a/drivers/gpio/gpio-ep93xx.c
+++ b/drivers/gpio/gpio-ep93xx.c
@@ -378,13 +378,6 @@ static int __devinit ep93xx_gpio_probe(struct platform_device *pdev)
         }
         ep93xx_gpio->mmio_base = mmio;
 
-        /* Default all ports to GPIO */
-        ep93xx_devcfg_set_bits(EP93XX_SYSCON_DEVCFG_KEYS |
-                               EP93XX_SYSCON_DEVCFG_GONK |
-                               EP93XX_SYSCON_DEVCFG_EONIDE |
-                               EP93XX_SYSCON_DEVCFG_GONIDE |
-                               EP93XX_SYSCON_DEVCFG_HONIDE);
-
         for (i = 0; i < ARRAY_SIZE(ep93xx_gpio_banks); i++) {
                 struct bgpio_chip *bgc = &ep93xx_gpio->bgc[i];
                 struct ep93xx_gpio_bank *bank = &ep93xx_gpio_banks[i];