diff options
| author | Fabio Estevam <[email protected]> | 2018-01-03 12:33:05 -0200 |
|---|---|---|
| committer | Stefano Babic <[email protected]> | 2018-01-04 16:29:04 +0100 |
| commit | 290e7cfdbfa288d26598c073186ab45e3fa711b3 (patch) | |
| tree | eecd827a87b3f18a30048c883e5939bec7462014 /drivers | |
| parent | 5a6440cac77db8083aa9b7f260e0ff3e994e7834 (diff) | |
mx6ull: Handle the CONFIG_MX6ULL cases correctly
Since commit 051ba9e082f7 ("Kconfig: mx6ull: Deselect MX6UL from
CONFIG_MX6ULL") CONFIG_MX6ULL does not select CONFIG_MX6UL anymore, so
take this into consideration in all the checks for CONFIG_MX6UL.
This fixes a boot regression.
Reported-by: Stefan Agner <[email protected]>
Signed-off-by: Fabio Estevam <[email protected]>
Reviewed-by: Stefan Agner <[email protected]>
Tested-by: Breno Lima <[email protected]>
Tested-by: Peng Fan <[email protected]>
Reviewed-by: Stefano Babic <[email protected]>
Tested-by: Jörg Krause <[email protected]>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/mxc_gpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c index c480eba9407..cfa620bceb3 100644 --- a/drivers/gpio/mxc_gpio.c +++ b/drivers/gpio/mxc_gpio.c @@ -47,12 +47,12 @@ static unsigned long gpio_ports[] = { #if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6) || \ defined(CONFIG_MX7) [4] = GPIO5_BASE_ADDR, -#ifndef CONFIG_MX6UL +#if !(defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)) [5] = GPIO6_BASE_ADDR, #endif #endif #if defined(CONFIG_MX53) || defined(CONFIG_MX6) || defined(CONFIG_MX7) -#ifndef CONFIG_MX6UL +#if !(defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)) [6] = GPIO7_BASE_ADDR, #endif #endif |