diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-15 09:22:15 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-15 09:22:15 -0500 |
| commit | fb537657d9e94a8d489eb9463451e9cf90cbe973 (patch) | |
| tree | 17a2b750de2caee4b9d3da009da85037b410c126 /drivers/gpio/mxc_gpio.c | |
| parent | 59612e4f24d2ee120c4e20d42fa23ba8e3574c51 (diff) | |
| parent | 8d9c0762a8cf0a5027e7cd3c6794693f2d64d007 (diff) | |
Merge tag 'u-boot-imx-20200115' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
-----------------------------------
- imx8:
add capricorn giedi deneb boards
- imx6:
fixed fow wandboard
- imx7: DM_ETHER for pico-imx7d
- fsl_esdhc_imx: add broken-cd property
- New SOC: IMXRT10xx
Travis:
https://travis-ci.org/sbabic/u-boot-imx/builds/637126531
Diffstat (limited to 'drivers/gpio/mxc_gpio.c')
| -rw-r--r-- | drivers/gpio/mxc_gpio.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c index 6592d141d3e..c924e52f071 100644 --- a/drivers/gpio/mxc_gpio.c +++ b/drivers/gpio/mxc_gpio.c @@ -41,14 +41,15 @@ static unsigned long gpio_ports[] = { #if defined(CONFIG_MX25) || defined(CONFIG_MX27) || defined(CONFIG_MX51) || \ defined(CONFIG_MX53) || defined(CONFIG_MX6) || \ defined(CONFIG_MX7) || defined(CONFIG_IMX8M) || \ - defined(CONFIG_ARCH_IMX8) + defined(CONFIG_ARCH_IMX8) || defined(CONFIG_IMXRT1050) [3] = GPIO4_BASE_ADDR, #endif #if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6) || \ defined(CONFIG_MX7) || defined(CONFIG_IMX8M) || \ - defined(CONFIG_ARCH_IMX8) + defined(CONFIG_ARCH_IMX8) || defined(CONFIG_IMXRT1050) [4] = GPIO5_BASE_ADDR, -#if !(defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL) || defined(CONFIG_IMX8M)) +#if !(defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL) || \ + defined(CONFIG_IMX8M) || defined(CONFIG_IMXRT1050)) [5] = GPIO6_BASE_ADDR, #endif #endif |