From e2f9687c02eac444fd5962b4ef55b9daf24f95ae Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 23 Apr 2013 09:43:15 +0200 Subject: [PATCH] pinctrl: move imx-iomux-v2 to drivers/pinctrl/ For consistency reasons. Signed-off-by: Sascha Hauer --- arch/arm/mach-imx/Kconfig | 1 + arch/arm/mach-imx/Makefile | 2 +- drivers/pinctrl/Kconfig | 5 +++++ drivers/pinctrl/Makefile | 1 + .../mach-imx/iomux-v2.c => drivers/pinctrl/imx-iomux-v2.c | 0 5 files changed, 8 insertions(+), 1 deletion(-) rename arch/arm/mach-imx/iomux-v2.c => drivers/pinctrl/imx-iomux-v2.c (100%) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 1c3199f91..d76732b2e 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 c98a302f6..0b156aae4 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 6ce01bffe..6b73d7b25 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 134c889c9..b03a20f66 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 similarity index 100% rename from arch/arm/mach-imx/iomux-v2.c rename to drivers/pinctrl/imx-iomux-v2.c