diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-23 09:43:15 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-23 09:47:24 +0200 |
| commit | e2f9687c02eac444fd5962b4ef55b9daf24f95ae (patch) | |
| tree | 08e42da7655e965ffbda24a9d487278426d136a6 | |
| parent | e20ee612d8ee99ba4e56b7ca3e757835ef50515c (diff) | |
| download | barebox-e2f9687c02eac444fd5962b4ef55b9daf24f95ae.tar.gz barebox-e2f9687c02eac444fd5962b4ef55b9daf24f95ae.tar.xz | |
pinctrl: move imx-iomux-v2 to drivers/pinctrl/
For consistency reasons.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-imx/Makefile | 2 | ||||
| -rw-r--r-- | drivers/pinctrl/Kconfig | 5 | ||||
| -rw-r--r-- | drivers/pinctrl/Makefile | 1 | ||||
| -rw-r--r-- | drivers/pinctrl/imx-iomux-v2.c (renamed from arch/arm/mach-imx/iomux-v2.c) | 0 |
5 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 1c3199f911..d76732b2e1 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -184,6 +184,7 @@ config ARCH_IMX27 config ARCH_IMX31 select CPU_V6 bool "i.MX31" + select PINCTRL_IMX_IOMUX_V2 config ARCH_IMX35 bool "i.MX35" diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index c98a302f6c..0b156aae43 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -3,7 +3,7 @@ obj-$(CONFIG_ARCH_IMX1) += imx1.o iomux-v1.o clk-imx1.o obj-$(CONFIG_ARCH_IMX25) += imx25.o clk-imx25.o obj-$(CONFIG_ARCH_IMX21) += imx21.o iomux-v1.o clk-imx21.o obj-$(CONFIG_ARCH_IMX27) += imx27.o iomux-v1.o clk-imx27.o -obj-$(CONFIG_ARCH_IMX31) += imx31.o iomux-v2.o clk-imx31.o +obj-$(CONFIG_ARCH_IMX31) += imx31.o clk-imx31.o obj-$(CONFIG_ARCH_IMX35) += imx35.o clk-imx35.o obj-$(CONFIG_ARCH_IMX51) += imx51.o imx5.o clk-imx5.o obj-$(CONFIG_ARCH_IMX53) += imx53.o imx5.o clk-imx5.o esdctl-v4.o diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index 6ce01bffe8..6b73d7b256 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -9,6 +9,11 @@ config PINCTRL from the devicetree. Legacy drivers here may not need this core support but instead provide their own SoC specific APIs +config PINCTRL_IMX_IOMUX_V2 + bool "i.MX iomux v2" + help + This iomux controller is found on i.MX31. + config PINCTRL_IMX_IOMUX_V3 select PINCTRL if OFDEVICE bool "i.MX iomux v3" diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile index 134c889c99..b03a20f663 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile @@ -1,2 +1,3 @@ obj-$(CONFIG_PINCTRL) += pinctrl.o +obj-$(CONFIG_PINCTRL_IMX_IOMUX_V2) += imx-iomux-v2.o obj-$(CONFIG_PINCTRL_IMX_IOMUX_V3) += imx-iomux-v3.o diff --git a/arch/arm/mach-imx/iomux-v2.c b/drivers/pinctrl/imx-iomux-v2.c index cef0340909..cef0340909 100644 --- a/arch/arm/mach-imx/iomux-v2.c +++ b/drivers/pinctrl/imx-iomux-v2.c |