1 files changed, 11 insertions, 23 deletions
diff --git a/Documentation/devicetree/bindings/rtc/dw-apb.txt b/Documentation/devicetree/bindings/rtc/dw-apb.txt
index eb2327b2bdb3..c703d51abb6c 100644
--- a/Documentation/devicetree/bindings/rtc/dw-apb.txt
+++ b/Documentation/devicetree/bindings/rtc/dw-apb.txt
@@ -1,7 +1,10 @@
 * 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,25 +23,10 @@ systems may use one.
 Example:
+        timer@ffe00000 {
-                timer1: timer@ffc09000 {
+                compatible = "snps,dw-apb-timer";
-                                compatible = "snps,dw-apb-timer-sp";
+                interrupts = <0 170 4>;
-                                interrupts = <0 168 4>;
+                reg = <0xffe00000 0x1000>;
-                                clock-frequency = <200000000>;
+                clocks = <&timer_clk>, <&timer_pclk>;
-                                reg = <0xffc09000 0x1000>;
+                clock-names = "timer", "pclk";
-                        };
+        };
-                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>;
-                                reg = <0xffe00000 0x1000>;
-                                clocks = <&timer_clk>, <&timer_pclk>;
-                                clock-names = "timer", "pclk";
-                        };

diff --git a/Documentation/devicetree/bindings/rtc/dw-apb.txt b/Documentation/devicetree/bindings/rtc/dw-apb.txt index eb2327b2bdb3..c703d51abb6c 100644 --- a/Documentation/devicetree/bindings/rtc/dw-apb.txt +++ b/Documentation/devicetree/bindings/rtc/dw-apb.txt
@@ -1,7 +1,10 @@
1	* Designware APB timer	1	* Designware APB timer
2		2
3	Required properties:	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	- reg: physical base address of the controller and length of memory mapped	8	- reg: physical base address of the controller and length of memory mapped
6	region.	9	region.
7	- interrupts: IRQ line for the timer.	10	- interrupts: IRQ line for the timer.
@@ -20,25 +23,10 @@ systems may use one.
20		23
21		24
22	Example:	25	Example:
23		26	timer@ffe00000 {
24	timer1: timer@ffc09000 {	27	compatible = "snps,dw-apb-timer";
25	compatible = "snps,dw-apb-timer-sp";	28	interrupts = <0 170 4>;
26	interrupts = <0 168 4>;	29	reg = <0xffe00000 0x1000>;
27	clock-frequency = <200000000>;	30	clocks = <&timer_clk>, <&timer_pclk>;
28	reg = <0xffc09000 0x1000>;	31	clock-names = "timer", "pclk";
29	};	32	};
30
31	timer2: timer@ffd00000 {
32	compatible = "snps,dw-apb-timer-osc";
33	interrupts = <0 169 4>;
34	clock-frequency = <200000000>;
35	reg = <0xffd00000 0x1000>;
36	};
37
38	timer3: timer@ffe00000 {
39	compatible = "snps,dw-apb-timer-osc";
40	interrupts = <0 170 4>;
41	reg = <0xffe00000 0x1000>;
42	clocks = <&timer_clk>, <&timer_pclk>;
43	clock-names = "timer", "pclk";
44	};