5 files changed, 9 insertions, 17 deletions

diff --git a/arch/powerpc/platforms/52xx/Kconfig b/arch/powerpc/platforms/52xx/Kconfig
index 47ea1be1481b..90f4496017e4 100644
--- a/arch/powerpc/platforms/52xx/Kconfig
+++ b/arch/powerpc/platforms/52xx/Kconfig
@@ -55,14 +55,6 @@ config PPC_MPC5200_BUGFIX
 
           It is safe to say 'Y' here
 
-config PPC_MPC5200_GPIO
-        bool "MPC5200 GPIO support"
-        depends on PPC_MPC52xx
-        select ARCH_REQUIRE_GPIOLIB
-        select GENERIC_GPIO
-        help
-          Enable gpiolib support for mpc5200 based boards
-
 config PPC_MPC5200_LPBFIFO
         tristate "MPC5200 LocalPlus bus FIFO driver"
         depends on PPC_MPC52xx
diff --git a/arch/powerpc/platforms/52xx/Makefile b/arch/powerpc/platforms/52xx/Makefile
index 2bc8cd0c5cfc..4e62486791e9 100644
--- a/arch/powerpc/platforms/52xx/Makefile
+++ b/arch/powerpc/platforms/52xx/Makefile
@@ -14,5 +14,4 @@ ifeq ($(CONFIG_PPC_LITE5200),y)
         obj-$(CONFIG_PM)        += lite5200_sleep.o lite5200_pm.o
 endif
 
-obj-$(CONFIG_PPC_MPC5200_GPIO)  += mpc52xx_gpio.o
 obj-$(CONFIG_PPC_MPC5200_LPBFIFO)       += mpc52xx_lpbfifo.o
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index a4ac78b6a0f8..47eae6ea5dd2 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -99,6 +99,10 @@ config GPIO_EXYNOS4
         def_bool y
         depends on CPU_EXYNOS4210
 
+config GPIO_MPC5200
+        def_bool y
+        depends on PPC_MPC52xx
+
 config GPIO_MXC
         def_bool y
         depends on ARCH_MXC
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index b847fb5b847c..720711251391 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -26,6 +26,7 @@ obj-$(CONFIG_GPIO_MAX732X)	+= gpio-max732x.o
 obj-$(CONFIG_GPIO_MC33880)      += gpio-mc33880.o
 obj-$(CONFIG_GPIO_MCP23S08)     += gpio-mcp23s08.o
 obj-$(CONFIG_GPIO_ML_IOH)       += gpio-ml-ioh.o
+obj-$(CONFIG_GPIO_MPC5200)      += gpio-mpc5200.o
 obj-$(CONFIG_GPIO_MXC)          += gpio-mxc.o
 obj-$(CONFIG_GPIO_MXS)          += gpio-mxs.o
 obj-$(CONFIG_PLAT_NOMADIK)      += gpio-nomadik.o
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c b/drivers/gpio/gpio-mpc5200.c
index 1757d1db4b51..52d3ed208105 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
+++ b/drivers/gpio/gpio-mpc5200.c
@@ -184,15 +184,13 @@ static int mpc52xx_gpiochip_remove(struct platform_device *ofdev)
 }
 
 static const struct of_device_id mpc52xx_wkup_gpiochip_match[] = {
-        {
-                .compatible = "fsl,mpc5200-gpio-wkup",
-        },
+        { .compatible = "fsl,mpc5200-gpio-wkup", },
         {}
 };
 
 static struct platform_driver mpc52xx_wkup_gpiochip_driver = {
         .driver = {
-                .name = "gpio_wkup",
+                .name = "mpc5200-gpio-wkup",
                 .owner = THIS_MODULE,
                 .of_match_table = mpc52xx_wkup_gpiochip_match,
         },
@@ -341,15 +339,13 @@ static int __devinit mpc52xx_simple_gpiochip_probe(struct platform_device *ofdev
 }
 
 static const struct of_device_id mpc52xx_simple_gpiochip_match[] = {
-        {
-                .compatible = "fsl,mpc5200-gpio",
-        },
+        { .compatible = "fsl,mpc5200-gpio", },
         {}
 };
 
 static struct platform_driver mpc52xx_simple_gpiochip_driver = {
         .driver = {
-                .name = "gpio",
+                .name = "mpc5200-gpio",
                 .owner = THIS_MODULE,
                 .of_match_table = mpc52xx_simple_gpiochip_match,
         },