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:48:25 +0200 |
| commit | 32dc070fd499a8a0bc4bc434fe74319c7463a97a (patch) | |
| tree | 7a0db8d600d5f42a0613eaa6e1411e0df86d7309 | |
| parent | e2f9687c02eac444fd5962b4ef55b9daf24f95ae (diff) | |
| download | barebox-32dc070fd499a8a0bc4bc434fe74319c7463a97a.tar.gz barebox-32dc070fd499a8a0bc4bc434fe74319c7463a97a.tar.xz | |
pinctrl: move imx-iomux-v1 to drivers/pinctrl/
For consistency reasons.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/Makefile | 6 | ||||
| -rw-r--r-- | drivers/pinctrl/Kconfig | 5 | ||||
| -rw-r--r-- | drivers/pinctrl/Makefile | 1 | ||||
| -rw-r--r-- | drivers/pinctrl/imx-iomux-v1.c (renamed from arch/arm/mach-imx/iomux-v1.c) | 0 |
5 files changed, 12 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index d76732b2e1..977fea5d83 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -165,10 +165,12 @@ choice config ARCH_IMX1 bool "i.MX1" select CPU_ARM920T + select PINCTRL_IMX_IOMUX_V1 config ARCH_IMX21 bool "i.MX21" select CPU_ARM926T + select PINCTRL_IMX_IOMUX_V1 config ARCH_IMX25 bool "i.MX25" @@ -180,6 +182,7 @@ config ARCH_IMX27 bool "i.MX27" select CPU_ARM926T select ARCH_HAS_FEC_IMX + select PINCTRL_IMX_IOMUX_V1 config ARCH_IMX31 select CPU_V6 diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 0b156aae43..339b6a1569 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -1,8 +1,8 @@ obj-y += clocksource.o gpio.o -obj-$(CONFIG_ARCH_IMX1) += imx1.o iomux-v1.o clk-imx1.o +obj-$(CONFIG_ARCH_IMX1) += imx1.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_IMX21) += imx21.o clk-imx21.o +obj-$(CONFIG_ARCH_IMX27) += imx27.o clk-imx27.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 diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index 6b73d7b256..e6aee50a5f 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_V1 + bool "i.MX iomux v1" + help + This iomux controller is found on i.MX1,21,27. + config PINCTRL_IMX_IOMUX_V2 bool "i.MX iomux v2" help diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile index b03a20f663..e9272d0fb0 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile @@ -1,3 +1,4 @@ obj-$(CONFIG_PINCTRL) += pinctrl.o +obj-$(CONFIG_PINCTRL_IMX_IOMUX_V1) += imx-iomux-v1.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-v1.c b/drivers/pinctrl/imx-iomux-v1.c index f8f90615c6..f8f90615c6 100644 --- a/arch/arm/mach-imx/iomux-v1.c +++ b/drivers/pinctrl/imx-iomux-v1.c |