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>

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index c31aeb01bb0002cc648b603c6c526ad83f9ab9a9..a9d390421b4f71c27d325ccd014130bea9daafeb 100644 (file)
--- 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
index fc4606f27dc793897aac033797f2e680e80f3dad..04e2c6dafbaa975e723c4345793c2712ae3048e8 100644 (file)
--- 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 b/drivers/pinctrl/sh-pfc/Kconfig
similarity index 57%
rename from drivers/sh/pfc/Kconfig
rename to drivers/pinctrl/sh-pfc/Kconfig
index eaeabc58bb06690f393b9c533ddcb690990fd2f1..ae69dbe18bfd7303416f78bde876eb3d7cbfc074 100644 (file)
--- a/drivers/sh/pfc/Kconfig
+++ b/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 b/drivers/pinctrl/sh-pfc/Makefile
similarity index 69%
rename from drivers/sh/pfc/Makefile
rename to drivers/pinctrl/sh-pfc/Makefile
index 6315cf35b34d4ab4889a36daa91dcda5791a5193..6ba6fb26cde910f2e3dae5320da6c7e2da5ef856 100644 (file)
--- a/drivers/sh/pfc/Makefile
+++ b/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 b/drivers/pinctrl/sh-pfc/core.c
similarity index 100%
rename from drivers/sh/pfc/core.c
rename to drivers/pinctrl/sh-pfc/core.c

diff --git a/drivers/sh/pfc/core.h b/drivers/pinctrl/sh-pfc/core.h
similarity index 100%
rename from drivers/sh/pfc/core.h
rename to drivers/pinctrl/sh-pfc/core.h

diff --git a/drivers/sh/pfc/gpio.c b/drivers/pinctrl/sh-pfc/gpio.c
similarity index 100%
rename from drivers/sh/pfc/gpio.c
rename to drivers/pinctrl/sh-pfc/gpio.c

diff --git a/drivers/sh/pfc/pinctrl.c b/drivers/pinctrl/sh-pfc/pinctrl.c
similarity index 100%
rename from drivers/sh/pfc/pinctrl.c
rename to drivers/pinctrl/sh-pfc/pinctrl.c

diff --git a/drivers/sh/Kconfig b/drivers/sh/Kconfig
index d860ef7435681adbbd0954d9415d989f592728e5..f168a6159961f621631a7af9a78d0099be61cbc3 100644 (file)
--- 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
index e57895b1a425ca7e5b8d14e587204fdd5ef70ef2..fc67f564f02cf77eec2350f4435836d409020314 100644 (file)
--- 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