diff options
| author | Tom Rini <trini@konsulko.com> | 2015-09-02 10:39:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-09-02 10:39:28 -0400 |
| commit | 0ffadab1b9ab59816a0f71c927604bb6c402d863 (patch) | |
| tree | 8338cea40ce53158387da4f708b09487cdebeaf9 /drivers/gpio/mxc_gpio.c | |
| parent | 6923b069bd50b3ac519b16b6ae6aabbd2984c391 (diff) | |
| parent | 37cf215253a488ba6b903989b1eff072f59d266e (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'drivers/gpio/mxc_gpio.c')
| -rw-r--r-- | drivers/gpio/mxc_gpio.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c index 0c48320966b..70fe5b6a4e3 100644 --- a/drivers/gpio/mxc_gpio.c +++ b/drivers/gpio/mxc_gpio.c @@ -40,16 +40,18 @@ static unsigned long gpio_ports[] = { [1] = GPIO2_BASE_ADDR, [2] = GPIO3_BASE_ADDR, #if defined(CONFIG_MX25) || defined(CONFIG_MX27) || defined(CONFIG_MX51) || \ - defined(CONFIG_MX53) || defined(CONFIG_MX6) + defined(CONFIG_MX53) || defined(CONFIG_MX6) || \ + defined(CONFIG_MX7) [3] = GPIO4_BASE_ADDR, #endif -#if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6) +#if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6) || \ + defined(CONFIG_MX7) [4] = GPIO5_BASE_ADDR, #ifndef CONFIG_MX6UL [5] = GPIO6_BASE_ADDR, #endif #endif -#if defined(CONFIG_MX53) || defined(CONFIG_MX6) +#if defined(CONFIG_MX53) || defined(CONFIG_MX6) || defined(CONFIG_MX7) #ifndef CONFIG_MX6UL [6] = GPIO7_BASE_ADDR, #endif |