nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

dts: Rename DW APB timer compatible strings

Browse source 
"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.
This commit is contained in:
Dinh Nguyen 2013-08-21 15:28:49 -05:00 committed by Olof Johansson
parent 13960b47dc
commit 620f5e1cbf
2 changed files with 15 additions and 27 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

24
Documentation/devicetree/bindings/rtc/dw-apb.txt
View file

@ -1,7 +1,10 @@
* Designware APB timer * Designware APB timer
Required properties: 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 - reg: physical base address of the controller and length of memory mapped
region. region.
- interrupts: IRQ line for the timer. - interrupts: IRQ line for the timer.
@ -20,23 +23,8 @@ systems may use one.
Example: Example:
timer@ffe00000 {
timer1: timer@ffc09000 { compatible = "snps,dw-apb-timer";
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";
interrupts = <0 170 4>; interrupts = <0 170 4>;
reg = <0xffe00000 0x1000>; reg = <0xffe00000 0x1000>;
clocks = <&timer_clk>, <&timer_pclk>; clocks = <&timer_clk>, <&timer_pclk>;

8
arch/arm/boot/dts/socfpga.dtsi
View file

@ -476,25 +476,25 @@ timer@fffec600 {
}; };
timer0: timer0@ffc08000 { timer0: timer0@ffc08000 {
compatible = "snps,dw-apb-timer-sp"; compatible = "snps,dw-apb-timer";
interrupts = <0 167 4>; interrupts = <0 167 4>;
reg = <0xffc08000 0x1000>; reg = <0xffc08000 0x1000>;
}; };
timer1: timer1@ffc09000 { timer1: timer1@ffc09000 {
compatible = "snps,dw-apb-timer-sp"; compatible = "snps,dw-apb-timer";
interrupts = <0 168 4>; interrupts = <0 168 4>;
reg = <0xffc09000 0x1000>; reg = <0xffc09000 0x1000>;
}; };
timer2: timer2@ffd00000 { timer2: timer2@ffd00000 {
compatible = "snps,dw-apb-timer-osc"; compatible = "snps,dw-apb-timer";
interrupts = <0 169 4>; interrupts = <0 169 4>;
reg = <0xffd00000 0x1000>; reg = <0xffd00000 0x1000>;
}; };
timer3: timer3@ffd01000 { timer3: timer3@ffd01000 {
compatible = "snps,dw-apb-timer-osc"; compatible = "snps,dw-apb-timer";
interrupts = <0 170 4>; interrupts = <0 170 4>;
reg = <0xffd01000 0x1000>; reg = <0xffd01000 0x1000>;
}; };