clocksource: sunxi: Change compatibles pattern
v2 cover clocksource: sunxi: Change compatibles pattern
Hi,
This is the second version of the clocksource compatible changes. The only difference with the v1 being that we're now droping the old compatibles, instead of keeping them, since the DT maintainers said it was fine.
Thanks,
Maxime
Maxime Ripard (2):
clocksource: sunxi: Add new compatibles
ARM: sunxi: dt: Convert to the new clocksource compatible
Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt | 4 ++-- arch/arm/boot/dts/sun4i-a10.dtsi | 2 +- arch/arm/boot/dts/sun5i-a10s.dtsi | 2 +- arch/arm/boot/dts/sun5i-a13.dtsi | 2 +- arch/arm/boot/dts/sun6i-a31.dtsi | 2 +- arch/arm/boot/dts/sun7i-a20.dtsi | 2 +- drivers/clocksource/sun4i_timer.c | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-)
Signature · 1 line
1.8.4.2
PATCH v2 1/2 clocksource: sunxi: Add new compatibles
The Allwinner A10 compatibles were following a slightly different compatible patterns than the rest of the SoCs for historical reasons. Add compatibles matching the other pattern to the timer driver for consistency, and keep the older one for backward compatibility.
--- Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt | 4 ++-- drivers/clocksource/sun4i_timer.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt +2 -2
@@ -2,7 +2,7 @@ Allwinner A1X SoCs Timer Controller Required properties: -- compatible : should be "allwinner,sun4i-timer" +- compatible : should be "allwinner,sun4i-a10-timer" - reg : Specifies base physical address and size of the registers. - interrupts : The interrupt of the first timer - clocks: phandle to the source clock (usually a 24 MHz fixed clock)
@@ -10,7 +10,7 @@ Required properties: Example: timer { - compatible = "allwinner,sun4i-timer"; + compatible = "allwinner,sun4i-a10-timer"; reg = <0x01c20c00 0x400>; interrupts = <22>; clocks = <&osc>;
drivers/clocksource/sun4i_timer.c +1 -1
@@ -196,5 +196,5 @@ static void __init sun4i_timer_init(struct device_node *node)clockevents_config_and_register (&sun4i_clockevent, rate,TIMER_SYNC_TICKS ,0xffffffff ); } -CLOCKSOURCE_OF_DECLARE (sun4i,"allwinner,sun4i-timer" , +CLOCKSOURCE_OF_DECLARE (sun4i,"allwinner,sun4i-a10-timer" , sun4i_timer_init);
Signature · 1 line
1.8.4.2
PATCH v2 2/2 ARM: sunxi: dt: Convert to the new clocksource compatible
In reply to Maxime RipardSwitch the device tree to the new compatibles introduced in the timer driver to have a common pattern accross all Allwinner SoCs.
--- arch/arm/boot/dts/sun4i-a10.dtsi | 2 +- arch/arm/boot/dts/sun5i-a10s.dtsi | 2 +- arch/arm/boot/dts/sun5i-a13.dtsi | 2 +- arch/arm/boot/dts/sun6i-a31.dtsi | 2 +- arch/arm/boot/dts/sun7i-a20.dtsi | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/boot/dts/sun4i-a10.dtsi +1 -1
@@ -409,7 +409,7 @@ }; timer at 01c20c00 { - compatible = "allwinner,sun4i-timer"; + compatible = "allwinner,sun4i-a10-timer"; reg = <0x01c20c00 0x90>; interrupts = <22>; clocks = <&osc24M>;
arch/arm/boot/dts/sun5i-a10s.dtsi +1 -1
@@ -370,7 +370,7 @@ }; timer at 01c20c00 { - compatible = "allwinner,sun4i-timer"; + compatible = "allwinner,sun4i-a10-timer"; reg = <0x01c20c00 0x90>; interrupts = <22>; clocks = <&osc24M>;
arch/arm/boot/dts/sun5i-a13.dtsi +1 -1
@@ -334,7 +334,7 @@ }; timer at 01c20c00 { - compatible = "allwinner,sun4i-timer"; + compatible = "allwinner,sun4i-a10-timer"; reg = <0x01c20c00 0x90>; interrupts = <22>; clocks = <&osc24M>;
arch/arm/boot/dts/sun6i-a31.dtsi +1 -1
@@ -241,7 +241,7 @@ }; timer at 01c20c00 { - compatible = "allwinner,sun4i-timer"; + compatible = "allwinner,sun4i-a10-timer"; reg = <0x01c20c00 0xa0>; interrupts = <0 18 4>, <0 19 4>,
arch/arm/boot/dts/sun7i-a20.dtsi +1 -1
@@ -450,7 +450,7 @@ }; timer at 01c20c00 { - compatible = "allwinner,sun4i-timer"; + compatible = "allwinner,sun4i-a10-timer"; reg = <0x01c20c00 0x90>; interrupts = <0 22 4>, <0 23 4>,
Signature · 1 line
1.8.4.2
Daniel Lezcano
Appliedv2 cover clocksource: sunxi: Change compatibles pattern
In reply to Maxime RipardQuoted 6 lines · Maxime Ripard
Hi,
This is the second version of the clocksource compatible changes. The only difference with the v1 being that we're now droping the old compatibles, instead of keeping them, since the DT maintainers said it was fine.
Hi Maxime,
applied to my tree for 3.15
Thanks
-- Daniel
Signature · 5 lines
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog