summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/sh/Kconfig16
-rw-r--r--drivers/sh/Makefile4
-rw-r--r--drivers/sh/pfc/Kconfig14
-rw-r--r--drivers/sh/pfc/Makefile2
-rw-r--r--drivers/sh/pfc/core.c (renamed from drivers/sh/pfc.c)0
-rw-r--r--drivers/sh/pfc/gpio.c (renamed from drivers/sh/pfc-gpio.c)0
-rw-r--r--include/linux/sh_pfc.h4
7 files changed, 21 insertions, 19 deletions
diff --git a/drivers/sh/Kconfig b/drivers/sh/Kconfig
index d7dbfee1bc70..d860ef743568 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 f5d93e8de090..e57895b1a425 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 000000000000..95b04f4edb88
--- /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 000000000000..d81707744b27
--- /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 ce4579ebd602..ce4579ebd602 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 d74e5a96024b..d74e5a96024b 100644
--- a/drivers/sh/pfc-gpio.c
+++ b/drivers/sh/pfc/gpio.c
diff --git a/include/linux/sh_pfc.h b/include/linux/sh_pfc.h
index ed1d8234f6ae..f522550fc32b 100644
--- a/include/linux/sh_pfc.h
+++ b/include/linux/sh_pfc.h
@@ -127,10 +127,10 @@ struct sh_pfc {
/* XXX compat for now */
#define pinmux_info sh_pfc
-/* drivers/sh/pfc-gpio.c */
+/* drivers/sh/pfc/gpio.c */
int sh_pfc_register_gpiochip(struct sh_pfc *pfc);
-/* drivers/sh/pfc.c */
+/* drivers/sh/pfc/core.c */
int register_sh_pfc(struct sh_pfc *pfc);
int sh_pfc_read_bit(struct pinmux_data_reg *dr, unsigned long in_pos);