---

yaml
---
r: 355373
b: refs/heads/master
c: 6e54d8d
h: refs/heads/master
i:
  355371: 9fb6acf
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56dc04af3b5e54be330e18630301d2bda5d365eb
+refs/heads/master: 6e54d8d252ed09ae148af6565971974af9a96e10

trunk/drivers/pinctrl/Kconfig

@@ -196,7 +196,7 @@ config PINCTRL_EXYNOS5440
 	select PINCONF
 
 source "drivers/pinctrl/mvebu/Kconfig"
-
+source "drivers/pinctrl/sh-pfc/Kconfig"
 source "drivers/pinctrl/spear/Kconfig"
 
 config PINCTRL_XWAY

trunk/drivers/pinctrl/Makefile

@@ -42,4 +42,6 @@ obj-$(CONFIG_PINCTRL_XWAY)	+= pinctrl-xway.o
 obj-$(CONFIG_PINCTRL_LANTIQ)	+= pinctrl-lantiq.o
 
 obj-$(CONFIG_PLAT_ORION)        += mvebu/
+obj-$(CONFIG_ARCH_SHMOBILE)	+= sh-pfc/
+obj-$(CONFIG_SUPERH)		+= sh-pfc/
 obj-$(CONFIG_PLAT_SPEAR)	+= spear/

trunk/drivers/sh/pfc/Kconfig → trunk/drivers/pinctrl/sh-pfc/Kconfig

@@ -1,18 +1,24 @@
-comment "Pin function controller options"
+#
+# Renesas SH and SH Mobile PINCTRL drivers
+#
 
-config SH_PFC
+if ARCH_SHMOBILE || SUPERH
+
+config PINCTRL_SH_PFC
 	# XXX move off the gpio dependency
 	depends on GENERIC_GPIO
 	select GPIO_SH_PFC if ARCH_REQUIRE_GPIOLIB
-	select PINCTRL_SH_PFC
-	select PINCTRL
 	select PINMUX
 	select PINCONF
 	def_bool y
+	help
+	  This enables pin control drivers for SH and SH Mobile platforms
 
 config GPIO_SH_PFC
 	bool "SuperH PFC GPIO support"
-	depends on SH_PFC && GPIOLIB
+	depends on PINCTRL_SH_PFC && GPIOLIB
 	help
 	  This enables support for GPIOs within the SoC's pin function
 	  controller.
+
+endif

trunk/drivers/sh/pfc/Makefile → trunk/drivers/pinctrl/sh-pfc/Makefile

@@ -2,4 +2,4 @@ sh-pfc-objs			= core.o pinctrl.o
 ifeq ($(CONFIG_GPIO_SH_PFC),y)
 sh-pfc-objs			+= gpio.o
 endif
-obj-y				+= sh-pfc.o
+obj-$(CONFIG_PINCTRL_SH_PFC)	+= sh-pfc.o

trunk/drivers/sh/Kconfig

@@ -1,6 +1,5 @@
 menu "SuperH / SH-Mobile Driver Options"
 
 source "drivers/sh/intc/Kconfig"
-source "drivers/sh/pfc/Kconfig"
 
 endmenu

trunk/drivers/sh/Makefile

@@ -5,7 +5,6 @@ obj-y	:= intc/
 
 obj-$(CONFIG_HAVE_CLK)		+= clk/
 obj-$(CONFIG_MAPLE)		+= maple/
-obj-$(CONFIG_SH_PFC)		+= pfc/
 obj-$(CONFIG_SUPERHYWAY)	+= superhyway/
 
 obj-y				+= pm_runtime.o