summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorPeng Fan <Peng.Fan@freescale.com>2015-04-13 09:39:35 +0800
committerPeng Fan <Peng.Fan@freescale.com>2015-05-05 14:41:16 +0800
commite1b7fed490d2129f6331d1b2175426087a52e3ce (patch)
tree967b9abfbab1e9c0294180023245de0bf840059b /drivers
parent6d383f8b190cf9749fa93780ac19a48239bdb7f0 (diff)
downloadu-boot-imx-e1b7fed490d2129f6331d1b2175426087a52e3ce.zip
u-boot-imx-e1b7fed490d2129f6331d1b2175426087a52e3ce.tar.gz
u-boot-imx-e1b7fed490d2129f6331d1b2175426087a52e3ce.tar.bz2
MLK-10812-4 mxc:gpio Add MX6UL support
comment out GPIO6/7 for MX6UL Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpio/mxc_gpio.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index 12f0e6c..1cf10c3 100644
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -52,11 +52,15 @@ static unsigned long gpio_ports[] = {
#if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6) || \
defined(CONFIG_MX7)
[4] = GPIO5_BASE_ADDR,
+#if !defined(CONFIG_MX6UL)
[5] = GPIO6_BASE_ADDR,
#endif
+#endif
#if defined(CONFIG_MX53) || defined(CONFIG_MX6) || defined(CONFIG_MX7)
+#if !defined(CONFIG_MX6UL)
[6] = GPIO7_BASE_ADDR,
#endif
+#endif
};
#ifdef CONFIG_MXC_RDC