diff options
author | Tom Rini <trini@konsulko.com> | 2023-03-20 17:52:42 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-03-20 17:52:42 -0400 |
commit | 51321493ebf029a9c3b33c02104f20fd5cb3a9be (patch) | |
tree | f8e216759f6005bc9f2715232897cf1cd319fff4 /drivers/timer | |
parent | 318af47668aa2347ca9bbf2114cb9af1d8739aca (diff) | |
parent | d35a1392c5d17e067d16b7b096565b16af495f34 (diff) |
Merge tag 'u-boot-rockchip-20230319' of https://source.denx.de/u-boot/custodians/u-boot-rockchip
- Fix for rockchip timer driver;
- Fix for rk3568 and rk3588 boot device and clock driver;
- Fix for rk3568 reset handler;
- Fix for rk3568 sdhci DLL at 52MHz;
Diffstat (limited to 'drivers/timer')
-rw-r--r-- | drivers/timer/rockchip_timer.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/timer/rockchip_timer.c b/drivers/timer/rockchip_timer.c index 62eacb98689..e66c49aa6bb 100644 --- a/drivers/timer/rockchip_timer.c +++ b/drivers/timer/rockchip_timer.c @@ -20,7 +20,7 @@ DECLARE_GLOBAL_DATA_PTR; #if CONFIG_IS_ENABLED(OF_PLATDATA) struct rockchip_timer_plat { - struct dtd_rockchip_rk3368_timer dtd; + struct dtd_rockchip_rk3288_timer dtd; }; #endif @@ -152,14 +152,12 @@ static const struct timer_ops rockchip_timer_ops = { }; static const struct udevice_id rockchip_timer_ids[] = { - { .compatible = "rockchip,rk3188-timer" }, { .compatible = "rockchip,rk3288-timer" }, - { .compatible = "rockchip,rk3368-timer" }, {} }; -U_BOOT_DRIVER(rockchip_rk3368_timer) = { - .name = "rockchip_rk3368_timer", +U_BOOT_DRIVER(rockchip_rk3288_timer) = { + .name = "rockchip_rk3288_timer", .id = UCLASS_TIMER, .of_match = rockchip_timer_ids, .probe = rockchip_timer_probe, |