5 files changed, 12 insertions, 2 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3f7714d8d2d2..fc8c0928bfaf 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -457,6 +457,7 @@ config ARCH_IOP32X
         depends on MMU
         select ARCH_REQUIRE_GPIOLIB
         select CPU_XSCALE
+        select GPIO_IOP
         select NEED_MACH_GPIO_H
         select NEED_RET_TO_USER
         select PCI
@@ -470,6 +471,7 @@ config ARCH_IOP33X
         depends on MMU
         select ARCH_REQUIRE_GPIOLIB
         select CPU_XSCALE
+        select GPIO_IOP
         select NEED_MACH_GPIO_H
         select NEED_RET_TO_USER
         select PCI
diff --git a/arch/arm/plat-iop/Makefile b/arch/arm/plat-iop/Makefile
index a99dc15a70f7..224e56c6049b 100644
--- a/arch/arm/plat-iop/Makefile
+++ b/arch/arm/plat-iop/Makefile
@@ -5,7 +5,6 @@
 obj-y :=
 
 # IOP32X
-obj-$(CONFIG_ARCH_IOP32X) += gpio.o
 obj-$(CONFIG_ARCH_IOP32X) += i2c.o
 obj-$(CONFIG_ARCH_IOP32X) += pci.o
 obj-$(CONFIG_ARCH_IOP32X) += setup.o
@@ -16,7 +15,6 @@ obj-$(CONFIG_ARCH_IOP32X) += pmu.o
 obj-$(CONFIG_ARCH_IOP32X) += restart.o
 
 # IOP33X
-obj-$(CONFIG_ARCH_IOP33X) += gpio.o
 obj-$(CONFIG_ARCH_IOP33X) += i2c.o
 obj-$(CONFIG_ARCH_IOP33X) += pci.o
 obj-$(CONFIG_ARCH_IOP33X) += setup.o
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index b6ed304863eb..cc30426d31ec 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -320,6 +320,15 @@ config GPIO_ICH
 
           If unsure, say N.
 
+config GPIO_IOP
+        tristate "Intel IOP GPIO"
+        depends on ARM && (ARCH_IOP32X || ARCH_IOP33X)
+        help
+          Say yes here to support the GPIO functionality of a number of Intel
+          IOP32X or IOP33X.
+
+          If unsure, say N.
+
 config GPIO_VX855
         tristate "VIA VX855/VX875 GPIO"
         depends on PCI
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 98e23ebba2cf..06e5662aa4ec 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_GPIO_F7188X)	+= gpio-f7188x.o
 obj-$(CONFIG_GPIO_GE_FPGA)      += gpio-ge.o
 obj-$(CONFIG_GPIO_GRGPIO)       += gpio-grgpio.o
 obj-$(CONFIG_GPIO_ICH)          += gpio-ich.o
+obj-$(CONFIG_GPIO_IOP)          += gpio-iop.o
 obj-$(CONFIG_GPIO_IT8761E)      += gpio-it8761e.o
 obj-$(CONFIG_GPIO_JANZ_TTL)     += gpio-janz-ttl.o
 obj-$(CONFIG_GPIO_KEMPLD)       += gpio-kempld.o
diff --git a/arch/arm/plat-iop/gpio.c b/drivers/gpio/gpio-iop.c
index 697de6dc4936..697de6dc4936 100644
--- a/arch/arm/plat-iop/gpio.c
+++ b/drivers/gpio/gpio-iop.c