summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-06-20 11:17:56 +0200
committerPaul Mundt <lethal@linux-sh.org>2012-06-20 11:17:56 +0200
commitb16b2a262c234d6abd8899d41769278337fff5b5 (patch)
treeec268b1e2a2c2068dea7af6dd755172e4653ff4a
parentsh: pfc: Split out gpio chip support. (diff)
downloadlinux-b16b2a262c234d6abd8899d41769278337fff5b5.tar.xz
linux-b16b2a262c234d6abd8899d41769278337fff5b5.zip
sh: pfc: Make gpio chip support optional where possible.
This implements some Kconfig knobs for ensuring that the PFC gpio chip can be disabled or built as a module in the cases where it's optional, or forcibly enabled in cases where it's not. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--drivers/sh/Kconfig15
-rw-r--r--drivers/sh/Makefile3
2 files changed, 17 insertions, 1 deletions
diff --git a/drivers/sh/Kconfig b/drivers/sh/Kconfig
index f168a6159961..d7dbfee1bc70 100644
--- a/drivers/sh/Kconfig
+++ b/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/drivers/sh/Makefile b/drivers/sh/Makefile
index be5b2934f067..f5d93e8de090 100644
--- a/drivers/sh/Makefile
+++ b/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