diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2011-12-18 17:44:26 -0500 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-01-03 03:10:08 -0500 |
| commit | 3bece55aa5356af0171aaa64fd9c4f7601c47f1c (patch) | |
| tree | 8dd08d51859062defc424ff234f1032b89e9410e /drivers/pinctrl | |
| parent | 43699dea1ea21a0d5786317a794cb2ba27a6f4fe (diff) | |
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>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/pinctrl/Makefile | 4 | ||||
| -rw-r--r-- | drivers/pinctrl/pinctrl-sirf.c (renamed from drivers/pinctrl/pinmux-sirf.c) | 0 | ||||
| -rw-r--r-- | drivers/pinctrl/pinctrl-u300.c (renamed from drivers/pinctrl/pinmux-u300.c) | 0 |
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index c63c72102989..afaf88558125 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig | |||
| @@ -23,13 +23,13 @@ config DEBUG_PINCTRL | |||
| 23 | help | 23 | help |
| 24 | Say Y here to add some extra checks and diagnostics to PINCTRL calls. | 24 | Say Y here to add some extra checks and diagnostics to PINCTRL calls. |
| 25 | 25 | ||
| 26 | config PINMUX_SIRF | 26 | config PINCTRL_SIRF |
| 27 | bool "CSR SiRFprimaII pinmux driver" | 27 | bool "CSR SiRFprimaII pin controller driver" |
| 28 | depends on ARCH_PRIMA2 | 28 | depends on ARCH_PRIMA2 |
| 29 | select PINMUX | 29 | select PINMUX |
| 30 | 30 | ||
| 31 | config PINMUX_U300 | 31 | config PINCTRL_U300 |
| 32 | bool "U300 pinmux driver" | 32 | bool "U300 pin controller driver" |
| 33 | depends on ARCH_U300 | 33 | depends on ARCH_U300 |
| 34 | select PINMUX | 34 | select PINMUX |
| 35 | 35 | ||
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile index c046f78dd7f7..827601cc68f6 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile | |||
| @@ -5,6 +5,6 @@ ccflags-$(CONFIG_DEBUG_PINCTRL) += -DDEBUG | |||
| 5 | obj-$(CONFIG_PINCTRL) += core.o | 5 | obj-$(CONFIG_PINCTRL) += core.o |
| 6 | obj-$(CONFIG_PINMUX) += pinmux.o | 6 | obj-$(CONFIG_PINMUX) += pinmux.o |
| 7 | obj-$(CONFIG_PINCONF) += pinconf.o | 7 | obj-$(CONFIG_PINCONF) += pinconf.o |
| 8 | obj-$(CONFIG_PINMUX_SIRF) += pinmux-sirf.o | 8 | obj-$(CONFIG_PINCTRL_SIRF) += pinctrl-sirf.o |
| 9 | obj-$(CONFIG_PINMUX_U300) += pinmux-u300.o | 9 | obj-$(CONFIG_PINCTRL_U300) += pinctrl-u300.o |
| 10 | obj-$(CONFIG_PINCTRL_COH901) += pinctrl-coh901.o | 10 | obj-$(CONFIG_PINCTRL_COH901) += pinctrl-coh901.o |
diff --git a/drivers/pinctrl/pinmux-sirf.c b/drivers/pinctrl/pinctrl-sirf.c index 99e688e07ea0..99e688e07ea0 100644 --- a/drivers/pinctrl/pinmux-sirf.c +++ b/drivers/pinctrl/pinctrl-sirf.c | |||
diff --git a/drivers/pinctrl/pinmux-u300.c b/drivers/pinctrl/pinctrl-u300.c index 7e89b367a7e5..7e89b367a7e5 100644 --- a/drivers/pinctrl/pinmux-u300.c +++ b/drivers/pinctrl/pinctrl-u300.c | |||