diff options
| author | Linus Walleij | 2012-04-26 13:56:05 +0200 |
|---|---|---|
| committer | Linus Walleij | 2012-05-11 10:33:43 +0200 |
| commit | 1ae4e59279b185a850ad25da4eb5a771bf36bdcb (patch) | |
| tree | 6e8f05ffdc01b14918ab1c66619d55f14f700005 | |
| parent | Merge tag 'pinctrl-mergebase-20120418' into HEAD (diff) | |
| download | kernel-qcow2-linux-1ae4e59279b185a850ad25da4eb5a771bf36bdcb.tar.gz kernel-qcow2-linux-1ae4e59279b185a850ad25da4eb5a771bf36bdcb.tar.xz kernel-qcow2-linux-1ae4e59279b185a850ad25da4eb5a771bf36bdcb.zip | |
gpio: move the Nomadik GPIO driver to pinctrl
I'm moving this driver over to the pinctrl subsystem to convert
the custom pin mux/config scheme over to use pinctrl.
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | drivers/gpio/Makefile | 1 | ||||
| -rw-r--r-- | drivers/pinctrl/Makefile | 1 | ||||
| -rw-r--r-- | drivers/pinctrl/pinctrl-nomadik.c (renamed from drivers/gpio/gpio-nomadik.c) | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 007f54bd0081..a4193ab1b266 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -36,7 +36,6 @@ obj-$(CONFIG_GPIO_MSM_V1) += gpio-msm-v1.o obj-$(CONFIG_GPIO_MSM_V2) += gpio-msm-v2.o obj-$(CONFIG_GPIO_MXC) += gpio-mxc.o obj-$(CONFIG_GPIO_MXS) += gpio-mxs.o -obj-$(CONFIG_PLAT_NOMADIK) += gpio-nomadik.o obj-$(CONFIG_ARCH_OMAP) += gpio-omap.o obj-$(CONFIG_GPIO_PCA953X) += gpio-pca953x.o obj-$(CONFIG_GPIO_PCF857X) += gpio-pcf857x.o diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile index 8e3c95a02fbd..dd797caf5799 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile @@ -11,6 +11,7 @@ endif obj-$(CONFIG_GENERIC_PINCONF) += pinconf-generic.o obj-$(CONFIG_PINCTRL_PXA3xx) += pinctrl-pxa3xx.o obj-$(CONFIG_PINCTRL_MMP2) += pinctrl-mmp2.o +obj-$(CONFIG_PLAT_NOMADIK) += pinctrl-nomadik.o obj-$(CONFIG_PINCTRL_PXA168) += pinctrl-pxa168.o obj-$(CONFIG_PINCTRL_PXA910) += pinctrl-pxa910.o obj-$(CONFIG_PINCTRL_SIRF) += pinctrl-sirf.o diff --git a/drivers/gpio/gpio-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c index 9b126b6d79cc..9b126b6d79cc 100644 --- a/drivers/gpio/gpio-nomadik.c +++ b/drivers/pinctrl/pinctrl-nomadik.c |