Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bece55a authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl: rename U300 and SIRF pin controllers 



For stringent order, rename the pinmux-* pin controllers to
pinctrl-* and also rename the Kconfig symbols and in-kernel
users.

Cc: Rongjun Ying <Rongjun.Ying@csr.com>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 43699dea

arch/arm/mach-u300/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ comment "ST-Ericsson Mobile Platform Products" 
config MACH_U300

	bool "U300"

	select PINCTRL

	select PINMUX_U300

	select PINCTRL_U300

	select PINCTRL_COH901



comment "ST-Ericsson U300/U330/U335/U365 Feature Selections"

drivers/pinctrl/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ config DEBUG_PINCTRL 
	help

	  Say Y here to add some extra checks and diagnostics to PINCTRL calls.



config PINMUX_SIRF

	bool "CSR SiRFprimaII pinmux driver"

config PINCTRL_SIRF

	bool "CSR SiRFprimaII pin controller driver"

	depends on ARCH_PRIMA2

	select PINMUX



config PINMUX_U300

	bool "U300 pinmux driver"

config PINCTRL_U300

	bool "U300 pin controller driver"

	depends on ARCH_U300

	select PINMUX

drivers/pinctrl/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -5,6 +5,6 @@ ccflags-$(CONFIG_DEBUG_PINCTRL) += -DDEBUG 
obj-$(CONFIG_PINCTRL)		+= core.o

obj-$(CONFIG_PINMUX)		+= pinmux.o

obj-$(CONFIG_PINCONF)		+= pinconf.o

obj-$(CONFIG_PINMUX_SIRF)	+= pinmux-sirf.o

obj-$(CONFIG_PINMUX_U300)	+= pinmux-u300.o

obj-$(CONFIG_PINCTRL_SIRF)	+= pinctrl-sirf.o

obj-$(CONFIG_PINCTRL_U300)	+= pinctrl-u300.o

obj-$(CONFIG_PINCTRL_COH901)	+= pinctrl-coh901.o