diff options
author | Tom Rini <trini@konsulko.com> | 2020-06-25 09:33:39 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-06-25 09:33:39 -0400 |
commit | f0e236c8d6646f6ef0ebf8f043962a07dda3b3a3 (patch) | |
tree | 393f3a5a757c2faf8e1506a6a94e70d253b591dd /drivers/gpio | |
parent | 6ccbd1590fb15b673c90c9ccde5da8dcaaf80a10 (diff) | |
parent | b8fd54d62f92658cbd20ca051304e13eabf24ddd (diff) | |
download | u-boot-f0e236c8d6646f6ef0ebf8f043962a07dda3b3a3.tar.gz |
Merge tag 'xilinx-for-v2020.10' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze into next
Xilinx changes for v2020.10
Versal:
- xspi bootmode fix
- Removing one clock from clk driver
- Align u-boot memory setting with OS by default
- Map TCM and OCM by default
ZynqMP:
- Minor DT improvements
- Reduce console buffer for mini configurations
- Add fix for AMS
- Add support for XDP platform
Zynq:
- Support for AES engine
- Enable bigger memory test by default
- Extend documentation for SD preparation
- Use different freq for Topic miami board
mmc:
- minor GD pointer removal
net:
- Support fixed-link cases by zynq gem
- Fix phy looking loop in axi enet driver
spi:
- Cleanup global macros for xilinx spi drivers
firmware:
- Add support for pmufw reloading
fpga:
- Improve error status reporting
common:
- Remove 4kB addition space for FDT allocation
Diffstat (limited to 'drivers/gpio')
-rw-r--r-- | drivers/gpio/mxc_gpio.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c index c924e52f071..316dcc757b2 100644 --- a/drivers/gpio/mxc_gpio.c +++ b/drivers/gpio/mxc_gpio.c @@ -281,7 +281,10 @@ static int mxc_gpio_probe(struct udevice *dev) char name[18], *str; banknum = plat->bank_index; - sprintf(name, "GPIO%d_", banknum + 1); + if (IS_ENABLED(CONFIG_ARCH_IMX8)) + sprintf(name, "GPIO%d_", banknum); + else + sprintf(name, "GPIO%d_", banknum + 1); str = strdup(name); if (!str) return -ENOMEM; |