---

yaml --- r: 313759 b: refs/heads/master c: b16b2a2 h: refs/heads/master i: 313757: da783e9 313755: fee7e08 313751: 7a1edd6 313743: 63ca38f 313727: c060158 v: v3
git-mirror · Jun 20, 2012 · 7dfac08 · 7dfac08
1 parent fcba18c
commit 7dfac08
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3c185a7614cd95ea9b68d89a8d1ee4227ee9018
+refs/heads/master: b16b2a262c234d6abd8899d41769278337fff5b5
diff --git a/trunk/drivers/sh/Kconfig b/trunk/drivers/sh/Kconfig
@@ -2,4 +2,19 @@ menu "SuperH / SH-Mobile Driver Options"
 
 source "drivers/sh/intc/Kconfig"
 
+comment "Pin function controller options"
+
+config SH_PFC
+	# XXX move off the gpio dependency
+	depends on GENERIC_GPIO
+	select GPIO_SH_PFC if ARCH_REQUIRE_GPIOLIB
+	def_bool y
+
+config GPIO_SH_PFC
+	tristate "SuperH PFC GPIO support"
+	depends on SH_PFC && GPIOLIB
+	help
+	  This enables support for GPIOs within the SoC's pin function
+	  controller.
+
 endmenu
diff --git a/trunk/drivers/sh/Makefile b/trunk/drivers/sh/Makefile
@@ -6,5 +6,6 @@ obj-y	:= intc/
 obj-$(CONFIG_HAVE_CLK)		+= clk/
 obj-$(CONFIG_MAPLE)		+= maple/
 obj-$(CONFIG_SUPERHYWAY)	+= superhyway/
-obj-$(CONFIG_GENERIC_GPIO)	+= pfc.o pfc-gpio.o
+obj-$(CONFIG_SH_PFC)		+= pfc.o
+obj-$(CONFIG_GPIO_SH_PFC)	+= pfc-gpio.o
 obj-y				+= pm_runtime.o