diff options
| author | Tom Rini <trini@konsulko.com> | 2015-08-02 07:40:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-02 07:40:37 -0400 |
| commit | 7a1af7a79bd79ded6a78d0c1afdbc3353669e313 (patch) | |
| tree | 6adcb6dfb2782e8502ca07e2533bee3f95eaeae9 /drivers/gpio | |
| parent | 8968b914be7bfd67d179d0395898bd9db67aaad1 (diff) | |
| parent | f85764cc1f6ab01ffc60dd78de9c4de4cff2b5ce (diff) | |
| download | u-boot-imx-7a1af7a79bd79ded6a78d0c1afdbc3353669e313.zip u-boot-imx-7a1af7a79bd79ded6a78d0c1afdbc3353669e313.tar.gz u-boot-imx-7a1af7a79bd79ded6a78d0c1afdbc3353669e313.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/mxc_gpio.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c index 2012f99..57a650f 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, |