Ver código fonte

Merge tag 'renesas-dt-clocksource-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Merge "Renesas ARM Based SoC DT Clocksource Updates for v3.19" from Simon
Horman:

* sh_mtu2: Drop incorrect SoC family name
* sh_tmu: Document r8a7778 and r8a7740 bindings

* tag 'renesas-dt-clocksource-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  clocksource: sh_mtu2: Drop incorrect SoC family name
  clocksource: sh_tmu: Document r8a7778 binding
  clocksource: sh_tmu: Document R-Mobile r8a7740 binding

Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson 10 anos atrás
pai
commit
a0f3e826e8

+ 1 - 1
Documentation/devicetree/bindings/timer/renesas,mtu2.txt

@@ -1,4 +1,4 @@
-* Renesas R-Car Multi-Function Timer Pulse Unit 2 (MTU2)
+* Renesas Multi-Function Timer Pulse Unit 2 (MTU2)
 
 
 The MTU2 is a multi-purpose, multi-channel timer/counter with configurable
 The MTU2 is a multi-purpose, multi-channel timer/counter with configurable
 clock inputs and programmable compare match.
 clock inputs and programmable compare match.

+ 3 - 1
Documentation/devicetree/bindings/timer/renesas,tmu.txt

@@ -1,4 +1,4 @@
-* Renesas R-Car Timer Unit (TMU)
+* Renesas R-Mobile/R-Car Timer Unit (TMU)
 
 
 The TMU is a 32-bit timer/counter with configurable clock inputs and
 The TMU is a 32-bit timer/counter with configurable clock inputs and
 programmable compare match.
 programmable compare match.
@@ -9,6 +9,8 @@ are independent. The TMU hardware supports up to three channels.
 Required Properties:
 Required Properties:
 
 
   - compatible: must contain one or more of the following:
   - compatible: must contain one or more of the following:
+    - "renesas,tmu-r8a7740" for the r8a7740 TMU
+    - "renesas,tmu-r8a7778" for the r8a7778 TMU
     - "renesas,tmu-r8a7779" for the r8a7779 TMU
     - "renesas,tmu-r8a7779" for the r8a7779 TMU
     - "renesas,tmu" for any TMU.
     - "renesas,tmu" for any TMU.
       This is a fallback for the above renesas,tmu-* entries
       This is a fallback for the above renesas,tmu-* entries