mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 4/4] pinctrl: move imx-iomux-v1 to drivers/pinctrl/
Date: Tue, 23 Apr 2013 09:55:29 +0200	[thread overview]
Message-ID: <1366703729-1258-5-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1366703729-1258-1-git-send-email-s.hauer@pengutronix.de>

For consistency reasons.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/mach-imx/Kconfig                                      | 3 +++
 arch/arm/mach-imx/Makefile                                     | 6 +++---
 drivers/pinctrl/Kconfig                                        | 5 +++++
 drivers/pinctrl/Makefile                                       | 1 +
 arch/arm/mach-imx/iomux-v1.c => drivers/pinctrl/imx-iomux-v1.c | 0
 5 files changed, 12 insertions(+), 3 deletions(-)
 rename arch/arm/mach-imx/iomux-v1.c => drivers/pinctrl/imx-iomux-v1.c (100%)

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index d76732b..977fea5 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 0b156aa..339b6a1 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 6b73d7b..e6aee50 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 b03a20f..e9272d0 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
similarity index 100%
rename from arch/arm/mach-imx/iomux-v1.c
rename to drivers/pinctrl/imx-iomux-v1.c
-- 
1.8.2.rc2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      parent reply	other threads:[~2013-04-23  7:55 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-23  7:55 [PATCH] pinctrl support Sascha Hauer
2013-04-23  7:55 ` [PATCH 1/4] Add initial " Sascha Hauer
2013-04-23  7:55 ` [PATCH 2/4] pinctrl: switch i.MX iomux-v3 support to pinctrl Sascha Hauer
2013-04-23  7:55 ` [PATCH 3/4] pinctrl: move imx-iomux-v2 to drivers/pinctrl/ Sascha Hauer
2013-04-23  7:55 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1366703729-1258-5-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox