---

yaml --- r: 308713 b: refs/heads/master c: 7b0d44f h: refs/heads/master i: 308711: 31ea513 v: v3
git-mirror · May 9, 2012 · 4059d8a · 4059d8a
1 parent 44c6768
commit 4059d8a
Show file tree

Hide file tree

Showing 4 changed files with 445 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35bdd29095ad614c5fb4a934bfd4f57a94dfd395
+refs/heads/master: 7b0d44f3b7cec0ae6f5e81d18df4a4077bbabb7c
diff --git a/trunk/drivers/gpio/Kconfig b/trunk/drivers/gpio/Kconfig
@@ -149,6 +149,14 @@ config GPIO_PXA
 	help
 	  Say yes here to support the PXA GPIO device
 
+config GPIO_STA2X11
+	bool "STA2x11/ConneXt GPIO support"
+	depends on MFD_STA2X11
+	select GENERIC_IRQ_CHIP
+	help
+	  Say yes here to support the STA2x11/ConneXt GPIO device.
+	  The GPIO module has 128 GPIO pins with alternate functions.
+
 config GPIO_XILINX
 	bool "Xilinx GPIO support"
 	depends on PPC_OF || MICROBLAZE

diff --git a/trunk/drivers/gpio/Makefile b/trunk/drivers/gpio/Makefile
@@ -49,6 +49,7 @@ obj-$(CONFIG_PLAT_SAMSUNG)	+= gpio-samsung.o
 obj-$(CONFIG_ARCH_SA1100)	+= gpio-sa1100.o
 obj-$(CONFIG_GPIO_SCH)		+= gpio-sch.o
 obj-$(CONFIG_GPIO_SODAVILLE)	+= gpio-sodaville.o
+obj-$(CONFIG_GPIO_STA2X11)	+= gpio-sta2x11.o
 obj-$(CONFIG_GPIO_STMPE)	+= gpio-stmpe.o
 obj-$(CONFIG_GPIO_SX150X)	+= gpio-sx150x.o
 obj-$(CONFIG_GPIO_TC3589X)	+= gpio-tc3589x.o