From 6963108ff0d3726b0ed222471e9e04590f2951ac Mon Sep 17 00:00:00 2001 From: Xingyu Wu Date: Wed, 31 Aug 2022 16:31:41 +0800 Subject: [PATCH] clocksource:timer:Modify compatible name Modify compatible name to 'starfive,jh7110-timers'. Signed-off-by: Xingyu Wu --- Documentation/devicetree/bindings/timer/starfive,timers.yaml | 6 +++--- arch/riscv/boot/dts/starfive/jh7110.dtsi | 2 +- drivers/clocksource/timer-starfive.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/timer/starfive,timers.yaml b/Documentation/devicetree/bindings/timer/starfive,timers.yaml index 9406633..081e7ca 100644 --- a/Documentation/devicetree/bindings/timer/starfive,timers.yaml +++ b/Documentation/devicetree/bindings/timer/starfive,timers.yaml @@ -1,7 +1,7 @@ # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) %YAML 1.2 --- -$id: http://devicetree.org/schemas/timer/starfive,timers.yaml# +$id: http://devicetree.org/schemas/timer/starfive,jh7110-timers.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# title: StarFive timers bindings @@ -12,7 +12,7 @@ maintainers: properties: compatible: - const: starfive,timers + const: starfive,jh7110-timers reg: maxItems: 1 @@ -62,7 +62,7 @@ examples: #include timer0: timer@15200000 { - compatible = "starfive,timers"; + compatible = "starfive,jh7110-timers"; reg = <0x15200000 0x10000>; interrupts = <85>, <86>, <87> ,<88>; interrupt-names = "timer0", "timer1", "timer2", "timer3"; diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi index 6ed66a1..e0abbcd 100755 --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi @@ -466,7 +466,7 @@ }; timer: timer@13050000 { - compatible = "starfive,timers"; + compatible = "starfive,jh7110-timers"; reg = <0x0 0x13050000 0x0 0x10000>; interrupts = <69>, <70>, <71> ,<72>; interrupt-names = "timer0", "timer1", diff --git a/drivers/clocksource/timer-starfive.c b/drivers/clocksource/timer-starfive.c index 9802874..ea1f41b 100755 --- a/drivers/clocksource/timer-starfive.c +++ b/drivers/clocksource/timer-starfive.c @@ -458,7 +458,7 @@ static int __init starfive_timer_of_init(struct device_node *np) { return do_starfive_timer_of_init(np, &jh7110_starfive_timer); } -TIMER_OF_DECLARE(starfive_timer, "starfive,timers", starfive_timer_of_init); +TIMER_OF_DECLARE(starfive_timer, "starfive,jh7110-timers", starfive_timer_of_init); MODULE_AUTHOR("xingyu.wu "); MODULE_AUTHOR("samin.guo "); -- 2.7.4