Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 620f5e1c authored by Dinh Nguyen's avatar Dinh Nguyen Committed by Olof Johansson
Browse files

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: default avatarDinh Nguyen <dinguyen@altera.com>
Reviewed-by: default avatarPavel Machek <pavel@denx.de>
Acked-by: default avatarStephen 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: default avatarOlof 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.
parent 13960b47

Documentation/devicetree/bindings/rtc/dw-apb.txt

+11 −23
Original line number Diff line number Diff line 
* Designware APB timer



Required properties:

- compatible: "snps,dw-apb-timer-sp" or "snps,dw-apb-timer-osc"

- compatible: One of:

 	"snps,dw-apb-timer"

	"snps,dw-apb-timer-sp" <DEPRECATED>

	"snps,dw-apb-timer-osc" <DEPRECATED>

- reg: physical base address of the controller and length of memory mapped

  region.

- interrupts: IRQ line for the timer.
@@ -20,23 +23,8 @@ systems may use one. 




Example:



		timer1: timer@ffc09000 {

				compatible = "snps,dw-apb-timer-sp";

				interrupts = <0 168 4>;

				clock-frequency = <200000000>;

				reg = <0xffc09000 0x1000>;

			};



		timer2: timer@ffd00000 {

				compatible = "snps,dw-apb-timer-osc";

				interrupts = <0 169 4>;

				clock-frequency = <200000000>;

				reg = <0xffd00000 0x1000>;

			};



		timer3: timer@ffe00000 {

				compatible = "snps,dw-apb-timer-osc";

	timer@ffe00000 {

		compatible = "snps,dw-apb-timer";

		interrupts = <0 170 4>;

		reg = <0xffe00000 0x1000>;

		clocks = <&timer_clk>, <&timer_pclk>;

arch/arm/boot/dts/socfpga.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -476,25 +476,25 @@ 
		};



		timer0: timer0@ffc08000 {

			compatible = "snps,dw-apb-timer-sp";

			compatible = "snps,dw-apb-timer";

			interrupts = <0 167 4>;

			reg = <0xffc08000 0x1000>;

		};



		timer1: timer1@ffc09000 {

			compatible = "snps,dw-apb-timer-sp";

			compatible = "snps,dw-apb-timer";

			interrupts = <0 168 4>;

			reg = <0xffc09000 0x1000>;

		};



		timer2: timer2@ffd00000 {

			compatible = "snps,dw-apb-timer-osc";

			compatible = "snps,dw-apb-timer";

			interrupts = <0 169 4>;

			reg = <0xffd00000 0x1000>;

		};



		timer3: timer3@ffd01000 {

			compatible = "snps,dw-apb-timer-osc";

			compatible = "snps,dw-apb-timer";

			interrupts = <0 170 4>;

			reg = <0xffd01000 0x1000>;

		};