mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Steffen Trumtrar <s.trumtrar@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Subject: [PATCH v2 11/11] ARM i.MX6: add imx-gpio devices
Date: Mon,  3 Sep 2012 10:18:18 +0200	[thread overview]
Message-ID: <1346660298-18148-12-git-send-email-s.trumtrar@pengutronix.de> (raw)
In-Reply-To: <1346660298-18148-1-git-send-email-s.trumtrar@pengutronix.de>

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
---
 arch/arm/mach-imx/Kconfig |    1 +
 arch/arm/mach-imx/imx6.c  |   26 ++++++++++++++------------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 0c09b57..eb4c2ae 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -194,6 +194,7 @@ config ARCH_IMX53
 config ARCH_IMX6
 	bool "i.MX6"
 	select ARCH_HAS_FEC_IMX
+	select GPIOLIB
 	select CPU_V7
 
 endchoice
diff --git a/arch/arm/mach-imx/imx6.c b/arch/arm/mach-imx/imx6.c
index a443343..80f558e 100644
--- a/arch/arm/mach-imx/imx6.c
+++ b/arch/arm/mach-imx/imx6.c
@@ -23,18 +23,6 @@
 
 #include "gpio.h"
 
-void *imx_gpio_base[] = {
-	(void *)MX6_GPIO1_BASE_ADDR,
-	(void *)MX6_GPIO2_BASE_ADDR,
-	(void *)MX6_GPIO3_BASE_ADDR,
-	(void *)MX6_GPIO4_BASE_ADDR,
-	(void *)MX6_GPIO5_BASE_ADDR,
-	(void *)MX6_GPIO6_BASE_ADDR,
-	(void *)MX6_GPIO7_BASE_ADDR,
-};
-
-int imx_gpio_count = ARRAY_SIZE(imx_gpio_base) * 32;
-
 void imx6_init_lowlevel(void)
 {
 	void __iomem *aips1 = (void *)MX6_AIPS1_ON_BASE_ADDR;
@@ -69,3 +57,17 @@ void imx6_init_lowlevel(void)
 	writel(0xffffffff, 0x020c407c);
 	writel(0xffffffff, 0x020c4080);
 }
+
+static int imx6_init(void)
+{
+	add_generic_device("imx-gpio", 0, NULL, MX6_GPIO1_BASE_ADDR, 0x4000, IORESOURCE_MEM, NULL);
+	add_generic_device("imx-gpio", 1, NULL, MX6_GPIO2_BASE_ADDR, 0x4000, IORESOURCE_MEM, NULL);
+	add_generic_device("imx-gpio", 2, NULL, MX6_GPIO3_BASE_ADDR, 0x4000, IORESOURCE_MEM, NULL);
+	add_generic_device("imx-gpio", 3, NULL, MX6_GPIO4_BASE_ADDR, 0x4000, IORESOURCE_MEM, NULL);
+	add_generic_device("imx-gpio", 4, NULL, MX6_GPIO5_BASE_ADDR, 0x4000, IORESOURCE_MEM, NULL);
+	add_generic_device("imx-gpio", 5, NULL, MX6_GPIO6_BASE_ADDR, 0x4000, IORESOURCE_MEM, NULL);
+	add_generic_device("imx-gpio", 6, NULL, MX6_GPIO7_BASE_ADDR, 0x4000, IORESOURCE_MEM, NULL);
+
+	return 0;
+}
+coredevice_initcall(imx6_init);
-- 
1.7.10.4


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

      parent reply	other threads:[~2012-09-03  8:18 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-03  8:18 [PATCH v2 00/11] ARM i.MX: add gpiolib support Steffen Trumtrar
2012-09-03  8:18 ` [PATCH v2 01/11] " Steffen Trumtrar
2012-09-03  8:18 ` [PATCH v2 02/11] ARM i.MX: switch to " Steffen Trumtrar
2012-09-03  8:18 ` [PATCH v2 03/11] ARM i.MX1: add imx-gpio devices Steffen Trumtrar
2012-09-03  8:18 ` [PATCH v2 04/11] ARM i.MX21: " Steffen Trumtrar
2012-09-03  8:18 ` [PATCH v2 05/11] ARM i.MX25: " Steffen Trumtrar
2012-09-03  8:18 ` [PATCH v2 06/11] ARM i.MX27: " Steffen Trumtrar
2012-09-03  8:18 ` [PATCH v2 07/11] ARM i.MX31: " Steffen Trumtrar
2012-09-03  8:18 ` [PATCH v2 08/11] ARM i.MX35: " Steffen Trumtrar
2012-09-03  8:18 ` [PATCH v2 09/11] ARM i.MX51: " Steffen Trumtrar
2012-09-03  8:18 ` [PATCH v2 10/11] ARM i.MX53: " Steffen Trumtrar
2012-09-03  8:18 ` Steffen Trumtrar [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=1346660298-18148-12-git-send-email-s.trumtrar@pengutronix.de \
    --to=s.trumtrar@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