Merge tag 'iwlwifi-for-kalle-2015-12-16' of https://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / Documentation / devicetree / bindings / rtc / dw-apb.txt

diff --git a/Documentation/devicetree/bindings/rtc/dw-apb.txt b/Documentation/devicetree/bindings/rtc/dw-apb.txt
index eb2327b2bdb3143ba126089536402d113719a6c8..c703d51abb6c08f96a80a897b104f21e0d649893 100644 (file)
--- 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:
-
-               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";
-                               interrupts = <0 170 4>;
-                               reg = <0xffe00000 0x1000>;
-                               clocks = <&timer_clk>, <&timer_pclk>;
-                               clock-names = "timer", "pclk";
-                       };
+       timer@ffe00000 {
+               compatible = "snps,dw-apb-timer";
+               interrupts = <0 170 4>;
+               reg = <0xffe00000 0x1000>;
+               clocks = <&timer_clk>, <&timer_pclk>;
+               clock-names = "timer", "pclk";
+       };