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

dts: Rename DW APB timer compatible strings

"dw-apb-timer-osc" and "dw-apb-timer-sp" are the same implementation of the
DW APB timer, just fed by different clocks. Thus, deprecate both
"dw-apb-timer-osc" and "dw-apb-timer-sp" in lieu of "dw-apb-timer".

Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
Reviewed-by: Pavel Machek <pavel@denx.de>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
CC: Rob Herring <rob.herring@calxeda.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
CC: Arnd Bergmann <arnd@arndb.de>
Cc: Olof Johansson <olof@lixom.net>
CC: Jamie Iles <jamie@jamieiles.com>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Pavel Machek <pavel@denx.de>
Cc: devicetree@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Olof Johansson <olof@lixom.net>

v3:
- Split out a separate that cleans up the timer entries and clock information.
- Clearly states which binding is deprecated in the bindings doc.

v2:
- Deprecate the "dw-apb-timer-osc" and "dw-apb-timer-sp" but maintain
backwards compatibility in the driver.

authored by

Dinh Nguyen and committed by
Olof Johansson
620f5e1c 13960b47

+15 -27
+11 -23
Documentation/devicetree/bindings/rtc/dw-apb.txt
··· 1 1 * Designware APB timer 2 2 3 3 Required properties: 4 - - compatible: "snps,dw-apb-timer-sp" or "snps,dw-apb-timer-osc" 4 + - compatible: One of: 5 + "snps,dw-apb-timer" 6 + "snps,dw-apb-timer-sp" <DEPRECATED> 7 + "snps,dw-apb-timer-osc" <DEPRECATED> 5 8 - reg: physical base address of the controller and length of memory mapped 6 9 region. 7 10 - interrupts: IRQ line for the timer. ··· 23 20 24 21 25 22 Example: 26 - 27 - timer1: timer@ffc09000 { 28 - compatible = "snps,dw-apb-timer-sp"; 29 - interrupts = <0 168 4>; 30 - clock-frequency = <200000000>; 31 - reg = <0xffc09000 0x1000>; 32 - }; 33 - 34 - timer2: timer@ffd00000 { 35 - compatible = "snps,dw-apb-timer-osc"; 36 - interrupts = <0 169 4>; 37 - clock-frequency = <200000000>; 38 - reg = <0xffd00000 0x1000>; 39 - }; 40 - 41 - timer3: timer@ffe00000 { 42 - compatible = "snps,dw-apb-timer-osc"; 43 - interrupts = <0 170 4>; 44 - reg = <0xffe00000 0x1000>; 45 - clocks = <&timer_clk>, <&timer_pclk>; 46 - clock-names = "timer", "pclk"; 47 - }; 23 + timer@ffe00000 { 24 + compatible = "snps,dw-apb-timer"; 25 + interrupts = <0 170 4>; 26 + reg = <0xffe00000 0x1000>; 27 + clocks = <&timer_clk>, <&timer_pclk>; 28 + clock-names = "timer", "pclk"; 29 + };
+4 -4
arch/arm/boot/dts/socfpga.dtsi
··· 476 476 }; 477 477 478 478 timer0: timer0@ffc08000 { 479 - compatible = "snps,dw-apb-timer-sp"; 479 + compatible = "snps,dw-apb-timer"; 480 480 interrupts = <0 167 4>; 481 481 reg = <0xffc08000 0x1000>; 482 482 }; 483 483 484 484 timer1: timer1@ffc09000 { 485 - compatible = "snps,dw-apb-timer-sp"; 485 + compatible = "snps,dw-apb-timer"; 486 486 interrupts = <0 168 4>; 487 487 reg = <0xffc09000 0x1000>; 488 488 }; 489 489 490 490 timer2: timer2@ffd00000 { 491 - compatible = "snps,dw-apb-timer-osc"; 491 + compatible = "snps,dw-apb-timer"; 492 492 interrupts = <0 169 4>; 493 493 reg = <0xffd00000 0x1000>; 494 494 }; 495 495 496 496 timer3: timer3@ffd01000 { 497 - compatible = "snps,dw-apb-timer-osc"; 497 + compatible = "snps,dw-apb-timer"; 498 498 interrupts = <0 170 4>; 499 499 reg = <0xffd01000 0x1000>; 500 500 };