From: Peng Fan <Peng.Fan@freescale.com>
Date: Mon, 20 Jul 2015 11:28:31 +0000 (+0800)
Subject: mxc: gpio add i.MX6UL support
X-Git-Tag: v2015.10-rc1~2^2~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f2753b06813f1debdb9d13c895d4f15acb8f2769;p=oweals%2Fu-boot.git

mxc: gpio add i.MX6UL support

i.MX6UL does not have GPIO6/7, so do not include them for i.MX6UL.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
---

diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index 2012f994c8..57a650f750 100644
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -45,11 +45,15 @@ static unsigned long gpio_ports[] = {
 #endif
 #if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6)
 	[4] = GPIO5_BASE_ADDR,
+#ifndef CONFIG_MX6UL
 	[5] = GPIO6_BASE_ADDR,
 #endif
+#endif
 #if defined(CONFIG_MX53) || defined(CONFIG_MX6)
+#ifndef CONFIG_MX6UL
 	[6] = GPIO7_BASE_ADDR,
 #endif
+#endif
 };
 
 static int mxc_gpio_direction(unsigned int gpio,