The Rockchip timer driver has been renamed after the fall back compatible. There's no need to replace the timer compatible in rk3188-radxarock-u-boot.dtsi anymore, so remove.

Signed-off-by: Johan Jonker jbx6244@gmail.com --- arch/arm/dts/rk3188-radxarock-u-boot.dtsi | 1 - 1 file changed, 1 deletion(-)

diff --git a/arch/arm/dts/rk3188-radxarock-u-boot.dtsi b/arch/arm/dts/rk3188-radxarock-u-boot.dtsi index 9c9016de..de299598 100644 --- a/arch/arm/dts/rk3188-radxarock-u-boot.dtsi +++ b/arch/arm/dts/rk3188-radxarock-u-boot.dtsi @@ -52,7 +52,6 @@ };

&timer3 { - compatible = "rockchip,rk3368-timer", "rockchip,rk3288-timer"; clock-frequency = <24000000>; u-boot,dm-spl; }; -- 2.20.1

On 2023/3/7 23:30, Johan Jonker wrote:

In the binding for the Rockchip timer the compatible string consists of a SoC orientated string and a fall back string "rockchip,rk3288-timer", so remove all unneeded ones and fix driver name.

Signed-off-by: Johan Jonker jbx6244@gmail.com

Reviewed-by: Kever Yang kever.yang@rock-chips.com

Thanks, - Kever

---

drivers/timer/rockchip_timer.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/timer/rockchip_timer.c b/drivers/timer/rockchip_timer.c index 62eacb98..e66c49aa 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,

-- 2.20.1