diff options
| -rw-r--r-- | drivers/pinctrl/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/pinctrl/Makefile | 2 | ||||
| -rw-r--r-- | drivers/pinctrl/sh-pfc/Kconfig (renamed from drivers/sh/pfc/Kconfig) | 16 | ||||
| -rw-r--r-- | drivers/pinctrl/sh-pfc/Makefile (renamed from drivers/sh/pfc/Makefile) | 2 | ||||
| -rw-r--r-- | drivers/pinctrl/sh-pfc/core.c (renamed from drivers/sh/pfc/core.c) | 0 | ||||
| -rw-r--r-- | drivers/pinctrl/sh-pfc/core.h (renamed from drivers/sh/pfc/core.h) | 0 | ||||
| -rw-r--r-- | drivers/pinctrl/sh-pfc/gpio.c (renamed from drivers/sh/pfc/gpio.c) | 0 | ||||
| -rw-r--r-- | drivers/pinctrl/sh-pfc/pinctrl.c (renamed from drivers/sh/pfc/pinctrl.c) | 0 | ||||
| -rw-r--r-- | drivers/sh/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/sh/Makefile | 1 |
10 files changed, 15 insertions, 9 deletions
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index c31aeb01bb00..a9d390421b4f 100644 --- 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 fc4606f27dc7..04e2c6dafbaa 100644 --- 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 index eaeabc58bb06..ae69dbe18bfd 100644 --- 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 index 6315cf35b34d..6ba6fb26cde9 100644 --- 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 index 8e7818bccb29..8e7818bccb29 100644 --- a/drivers/sh/pfc/core.c +++ b/drivers/pinctrl/sh-pfc/core.c diff --git a/drivers/sh/pfc/core.h b/drivers/pinctrl/sh-pfc/core.h index 87ae5fd2a201..87ae5fd2a201 100644 --- a/drivers/sh/pfc/core.h +++ b/drivers/pinctrl/sh-pfc/core.h diff --git a/drivers/sh/pfc/gpio.c b/drivers/pinctrl/sh-pfc/gpio.c index a0454f321710..a0454f321710 100644 --- a/drivers/sh/pfc/gpio.c +++ b/drivers/pinctrl/sh-pfc/gpio.c diff --git a/drivers/sh/pfc/pinctrl.c b/drivers/pinctrl/sh-pfc/pinctrl.c index 221bde03913a..221bde03913a 100644 --- a/drivers/sh/pfc/pinctrl.c +++ b/drivers/pinctrl/sh-pfc/pinctrl.c diff --git a/drivers/sh/Kconfig b/drivers/sh/Kconfig index d860ef743568..f168a6159961 100644 --- 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 e57895b1a425..fc67f564f02c 100644 --- 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 |