sh-pfc: Move driver from drivers/sh/ to drivers/pinctrl/

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Acked-by: Paul Mundt <lethal@linux-sh.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
git-mirror · Jan 25, 2013 · 6e54d8d · 6e54d8d
1 parent 56dc04a
commit 6e54d8d
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 9 deletions.
diff --git a/drivers/pinctrl/Kconfig b/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

diff --git a/drivers/pinctrl/Makefile b/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/
diff --git a/drivers/sh/pfc/Kconfig → drivers/pinctrl/sh-pfc/Kconfig b/drivers/sh/pfc/Kconfig → 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
diff --git a/drivers/sh/pfc/Makefile → drivers/pinctrl/sh-pfc/Makefile b/drivers/sh/pfc/Makefile → 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
diff --git a/drivers/sh/pfc/core.c → drivers/pinctrl/sh-pfc/core.c b/drivers/sh/pfc/core.c → drivers/pinctrl/sh-pfc/core.c
diff --git a/drivers/sh/pfc/core.h → drivers/pinctrl/sh-pfc/core.h b/drivers/sh/pfc/core.h → drivers/pinctrl/sh-pfc/core.h
diff --git a/drivers/sh/pfc/gpio.c → drivers/pinctrl/sh-pfc/gpio.c b/drivers/sh/pfc/gpio.c → drivers/pinctrl/sh-pfc/gpio.c
diff --git a/drivers/sh/pfc/pinctrl.c → drivers/pinctrl/sh-pfc/pinctrl.c b/drivers/sh/pfc/pinctrl.c → drivers/pinctrl/sh-pfc/pinctrl.c
diff --git a/drivers/sh/Kconfig b/drivers/sh/Kconfig
@@ -1,6 +1,5 @@
 menu "SuperH / SH-Mobile Driver Options"
 
 source "drivers/sh/intc/Kconfig"
-source "drivers/sh/pfc/Kconfig"
 
 endmenu
diff --git a/drivers/sh/Makefile b/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