sh: pfc: Shuffle PFC support core.

This follows the intc/clk changes and shuffles the PFC support code under
its own directory. This will facilitate better code sharing, and allow us
to trim down the exported interface by quite a margin.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

6 files changed, 19 insertions, 17 deletions

diff --git a/drivers/sh/Kconfig b/drivers/sh/Kconfig
index d7dbfee1bc7..d860ef74356 100644
--- a/drivers/sh/Kconfig
+++ b/drivers/sh/Kconfig
@@ -1,20 +1,6 @@
 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.
+source "drivers/sh/pfc/Kconfig"
 
 endmenu
diff --git a/drivers/sh/Makefile b/drivers/sh/Makefile
index f5d93e8de09..e57895b1a42 100644
--- a/drivers/sh/Makefile
+++ b/drivers/sh/Makefile
@@ -5,7 +5,7 @@ obj-y	:= intc/
 
 obj-$(CONFIG_HAVE_CLK)          += clk/
 obj-$(CONFIG_MAPLE)             += maple/
+obj-$(CONFIG_SH_PFC)            += pfc/
 obj-$(CONFIG_SUPERHYWAY)        += superhyway/
-obj-$(CONFIG_SH_PFC)            += pfc.o
-obj-$(CONFIG_GPIO_SH_PFC)       += pfc-gpio.o
+
 obj-y                           += pm_runtime.o
diff --git a/drivers/sh/pfc/Kconfig b/drivers/sh/pfc/Kconfig
new file mode 100644
index 00000000000..95b04f4edb8
--- /dev/null
+++ b/drivers/sh/pfc/Kconfig
@@ -0,0 +1,14 @@
+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.
diff --git a/drivers/sh/pfc/Makefile b/drivers/sh/pfc/Makefile
new file mode 100644
index 00000000000..d81707744b2
--- /dev/null
+++ b/drivers/sh/pfc/Makefile
@@ -0,0 +1,2 @@
+obj-y                           += core.o
+obj-$(CONFIG_GPIO_SH_PFC)       += gpio.o
diff --git a/drivers/sh/pfc.c b/drivers/sh/pfc/core.c
index ce4579ebd60..ce4579ebd60 100644
--- a/drivers/sh/pfc.c
+++ b/drivers/sh/pfc/core.c
diff --git a/drivers/sh/pfc-gpio.c b/drivers/sh/pfc/gpio.c
index d74e5a96024..d74e5a96024 100644
--- a/drivers/sh/pfc-gpio.c
+++ b/drivers/sh/pfc/gpio.c