diff options
| author | Tom Rini <trini@konsulko.com> | 2024-03-15 09:15:31 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-03-15 09:15:31 -0400 |
| commit | 099c94b7613bb10d97936447f5136f3a36694325 (patch) | |
| tree | 69bb43d1270009932f22fa220137b1ca025cea6b /drivers/gpio/rk_gpio.c | |
| parent | cacc0b2678c03d694e8be70f8e7b7601825f1c0f (diff) | |
| parent | 12bc1a5462a22f6dc5b91ecbf092cbaf94e66820 (diff) | |
Merge tag 'u-boot-rockchip-20240315' of https://source.denx.de/u-boot/custodians/u-boot-rockchip into next
Please pull the updates for rockchip platform:
- Add board: rk3588 Generic, Cool Pi CM5, Theobroma-Systems RK3588 Jaguar SBC,
Toybrick TB-RK3588X;
rk3588s Cool Pi 4B;
rk3566 Pine64 PineTab2;
- Add saradc v2 support;
- Add PMIC RK806 support;
- rk3588 disable force_jtag by default;
- Migrate to use IO-domain driver for all boards;
- Use common bss and stack addresses for rk33xx and rk35xx boards;
- Other updates for driver, config and dts;
Diffstat (limited to 'drivers/gpio/rk_gpio.c')
| -rw-r--r-- | drivers/gpio/rk_gpio.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpio/rk_gpio.c b/drivers/gpio/rk_gpio.c index 4a6ae554bf7..2e901ac5c73 100644 --- a/drivers/gpio/rk_gpio.c +++ b/drivers/gpio/rk_gpio.c @@ -11,7 +11,6 @@ #include <syscon.h> #include <linux/errno.h> #include <asm/gpio.h> -#include <asm/io.h> #include <asm/arch-rockchip/clock.h> #include <asm/arch-rockchip/hardware.h> #include <asm/arch-rockchip/gpio.h> @@ -201,8 +200,11 @@ static int rockchip_gpio_probe(struct udevice *dev) priv->bank = args.args[1] / ROCKCHIP_GPIOS_PER_BANK; } else { uc_priv->gpio_count = ROCKCHIP_GPIOS_PER_BANK; - end = strrchr(dev->name, '@'); - priv->bank = trailing_strtoln(dev->name, end); + ret = dev_read_alias_seq(dev, &priv->bank); + if (ret) { + end = strrchr(dev->name, '@'); + priv->bank = trailing_strtoln(dev->name, end); + } } priv->name[0] = 'A' + priv->bank; |