iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Laurent Pinchart 2012-12-15 23:51:19 +01:00 committed by Simon Horman
parent 56dc04af3b
commit 6e54d8d252
10 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pinctrl/Kconfig
View File

@ -196,7 +196,7 @@ config PINCTRL_EXYNOS5440
select PINCONF select PINCONF
source "drivers/pinctrl/mvebu/Kconfig" source "drivers/pinctrl/mvebu/Kconfig"
source "drivers/pinctrl/sh-pfc/Kconfig"
source "drivers/pinctrl/spear/Kconfig" source "drivers/pinctrl/spear/Kconfig"
config PINCTRL_XWAY config PINCTRL_XWAY

2
drivers/pinctrl/Makefile
View File

@ -42,4 +42,6 @@ obj-$(CONFIG_PINCTRL_XWAY) += pinctrl-xway.o
obj-$(CONFIG_PINCTRL_LANTIQ) += pinctrl-lantiq.o obj-$(CONFIG_PINCTRL_LANTIQ) += pinctrl-lantiq.o
obj-$(CONFIG_PLAT_ORION) += mvebu/ obj-$(CONFIG_PLAT_ORION) += mvebu/
obj-$(CONFIG_ARCH_SHMOBILE) += sh-pfc/
obj-$(CONFIG_SUPERH) += sh-pfc/
obj-$(CONFIG_PLAT_SPEAR) += spear/ obj-$(CONFIG_PLAT_SPEAR) += spear/

16
drivers/sh/pfc/Kconfig → drivers/pinctrl/sh-pfc/Kconfig
View File

@ -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 # XXX move off the gpio dependency
depends on GENERIC_GPIO depends on GENERIC_GPIO
select GPIO_SH_PFC if ARCH_REQUIRE_GPIOLIB select GPIO_SH_PFC if ARCH_REQUIRE_GPIOLIB
select PINCTRL_SH_PFC
select PINCTRL
select PINMUX select PINMUX
select PINCONF select PINCONF
def_bool y def_bool y
help
This enables pin control drivers for SH and SH Mobile platforms
config GPIO_SH_PFC config GPIO_SH_PFC
bool "SuperH PFC GPIO support" bool "SuperH PFC GPIO support"
depends on SH_PFC && GPIOLIB depends on PINCTRL_SH_PFC && GPIOLIB
help help
This enables support for GPIOs within the SoC's pin function This enables support for GPIOs within the SoC's pin function
controller. controller.
endif

2
drivers/sh/pfc/Makefile → drivers/pinctrl/sh-pfc/Makefile
View File

@ -2,4 +2,4 @@ sh-pfc-objs = core.o pinctrl.o
ifeq ($(CONFIG_GPIO_SH_PFC),y) ifeq ($(CONFIG_GPIO_SH_PFC),y)
sh-pfc-objs += gpio.o sh-pfc-objs += gpio.o
endif endif
obj-y += sh-pfc.o obj-$(CONFIG_PINCTRL_SH_PFC) += sh-pfc.o

0
drivers/sh/pfc/core.c → drivers/pinctrl/sh-pfc/core.c
View File

0
drivers/sh/pfc/core.h → drivers/pinctrl/sh-pfc/core.h
View File

0
drivers/sh/pfc/gpio.c → drivers/pinctrl/sh-pfc/gpio.c
View File

0
drivers/sh/pfc/pinctrl.c → drivers/pinctrl/sh-pfc/pinctrl.c
View File

1
drivers/sh/Kconfig
View File

@ -1,6 +1,5 @@
menu "SuperH / SH-Mobile Driver Options" menu "SuperH / SH-Mobile Driver Options"
source "drivers/sh/intc/Kconfig" source "drivers/sh/intc/Kconfig"
source "drivers/sh/pfc/Kconfig"
endmenu endmenu

1
drivers/sh/Makefile
View File

@ -5,7 +5,6 @@ obj-y := intc/
obj-$(CONFIG_HAVE_CLK) += clk/ obj-$(CONFIG_HAVE_CLK) += clk/
obj-$(CONFIG_MAPLE) += maple/ obj-$(CONFIG_MAPLE) += maple/
obj-$(CONFIG_SH_PFC) += pfc/
obj-$(CONFIG_SUPERHYWAY) += superhyway/ obj-$(CONFIG_SUPERHYWAY) += superhyway/
obj-y += pm_runtime.o obj-y += pm_runtime.o