diff options
| author | Olof Johansson <olof@lixom.net> | 2014-11-05 01:44:53 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-11-05 01:44:53 +0300 |
| commit | a0f3e826e8a5084bec73433a36670c386ed3aefe (patch) | |
| tree | 645ff52d54665b040207aff49234edfb869018a5 /Documentation | |
| parent | 1f2dd7bcbfbef9030aff449eccde1328408b70d1 (diff) | |
| parent | d5153cd734dd6c1243bb3dc98065be99b10d049f (diff) | |
| download | linux-a0f3e826e8a5084bec73433a36670c386ed3aefe.tar.xz | |
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/timer/renesas,mtu2.txt | 2 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/timer/renesas,tmu.txt | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/timer/renesas,mtu2.txt b/Documentation/devicetree/bindings/timer/renesas,mtu2.txt index d9a8d5af1a21..ba0a34d97eb8 100644 --- a/Documentation/devicetree/bindings/timer/renesas,mtu2.txt +++ b/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 clock inputs and programmable compare match. diff --git a/Documentation/devicetree/bindings/timer/renesas,tmu.txt b/Documentation/devicetree/bindings/timer/renesas,tmu.txt index 7db89fb25444..cd5f20bf2582 100644 --- a/Documentation/devicetree/bindings/timer/renesas,tmu.txt +++ b/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 programmable compare match. @@ -9,6 +9,8 @@ are independent. The TMU hardware supports up to three channels. Required Properties: - 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" for any TMU. This is a fallback for the above renesas,tmu-* entries |