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: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig
index c2d5c6c083645bedd1ec8156369225d822e06cc0..54d8f34fdee5d1d2770be32884011aac3949951f 100644 (file)
--- a/arch/arm/mach-u300/Kconfig
+++ b/arch/arm/mach-u300/Kconfig
@@ -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"

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index c63c721029894b3949a1b486ffee2d34d3c15feb..afaf885581251a9adb23c2111e1d370766b3cafa 100644 (file)
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -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
 

diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index c046f78dd7f708e11ed0a24b799c2dd82f46e54d..827601cc68f6c6c14fdaeb5aa195daf45a924a17 100644 (file)
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -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

diff --git a/drivers/pinctrl/pinmux-sirf.c b/drivers/pinctrl/pinctrl-sirf.c
similarity index 100%
rename from drivers/pinctrl/pinmux-sirf.c
rename to drivers/pinctrl/pinctrl-sirf.c

diff --git a/drivers/pinctrl/pinmux-u300.c b/drivers/pinctrl/pinctrl-u300.c
similarity index 100%
rename from drivers/pinctrl/pinmux-u300.c
rename to drivers/pinctrl/pinctrl-u300.c