diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-29 21:16:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-29 21:16:08 -0400 |
| commit | 719f42190d5f0238cb01ef2ffba8af2285f7bc7a (patch) | |
| tree | c789716a82ab552e0d0c1a9242fda7c41b04c238 /drivers/gpio | |
| parent | 7cb2060b4e63a89c50739dc8a9fcd5d73f86f0be (diff) | |
| parent | b9390ce51cb46f4b4acda320e7ea8e0bd120e4b8 (diff) | |
| download | u-boot-719f42190d5f0238cb01ef2ffba8af2285f7bc7a.tar.gz | |
Merge tag 'dm-pull-28jul20' of git://git.denx.de/u-boot-dmWIP/29Jul2020
Use binman instead of one of the Rockchip build scripts
Refactor to allow any arch to create SPI-flash images
New button uclass
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/mxs_gpio.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c index 2c16517e72..aaabb0216b 100644 --- a/drivers/gpio/mxs_gpio.c +++ b/drivers/gpio/mxs_gpio.c @@ -138,12 +138,6 @@ int name_to_gpio(const char *name) #include <asm/arch/gpio.h> #define MXS_MAX_GPIO_PER_BANK 32 -#ifdef CONFIG_MX28 -#define dtd_fsl_imx_gpio dtd_fsl_imx28_gpio -#else /* CONFIG_MX23 */ -#define dtd_fsl_imx_gpio dtd_fsl_imx23_gpio -#endif - DECLARE_GLOBAL_DATA_PTR; /* * According to i.MX28 Reference Manual: @@ -158,7 +152,7 @@ DECLARE_GLOBAL_DATA_PTR; struct mxs_gpio_platdata { #if CONFIG_IS_ENABLED(OF_PLATDATA) - struct dtd_fsl_imx_gpio dtplat; + struct dtd_fsl_imx23_gpio dtplat; #endif unsigned int bank; int gpio_ranges; @@ -247,7 +241,7 @@ static int mxs_gpio_probe(struct udevice *dev) char name[16], *str; #if CONFIG_IS_ENABLED(OF_PLATDATA) - struct dtd_fsl_imx_gpio *dtplat = &plat->dtplat; + struct dtd_fsl_imx23_gpio *dtplat = &plat->dtplat; priv->bank = (unsigned int)dtplat->reg[0]; uc_priv->gpio_count = dtplat->gpio_ranges[3]; #else |