Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

authored by

Maxime Ripard and committed by
Daniel Lezcano
ec6c085c 9affbd24

+3 -3
+2 -2
Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt
··· 2 2 3 3 Required properties: 4 4 5 - - compatible : should be "allwinner,sun4i-timer" 5 + - compatible : should be "allwinner,sun4i-a10-timer" 6 6 - reg : Specifies base physical address and size of the registers. 7 7 - interrupts : The interrupt of the first timer 8 8 - clocks: phandle to the source clock (usually a 24 MHz fixed clock) ··· 10 10 Example: 11 11 12 12 timer { 13 - compatible = "allwinner,sun4i-timer"; 13 + compatible = "allwinner,sun4i-a10-timer"; 14 14 reg = <0x01c20c00 0x400>; 15 15 interrupts = <22>; 16 16 clocks = <&osc>;
+1 -1
drivers/clocksource/sun4i_timer.c
··· 196 196 clockevents_config_and_register(&sun4i_clockevent, rate, 197 197 TIMER_SYNC_TICKS, 0xffffffff); 198 198 } 199 - CLOCKSOURCE_OF_DECLARE(sun4i, "allwinner,sun4i-timer", 199 + CLOCKSOURCE_OF_DECLARE(sun4i, "allwinner,sun4i-a10-timer", 200 200 sun4i_timer_init);