| From 3d2e6c20afb88b755364bf5f76cc5797d8ae9f22 Mon Sep 17 00:00:00 2001 |
| From: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Date: Wed, 14 May 2014 03:10:05 +0200 |
| Subject: ARM: shmobile: r7s72100: document MSTP clock support |
| |
| Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Acked-by: Magnus Damm <damm+renesas@opensource.se> |
| Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Acked-by: Mike Turquette <mturquette@linaro.org> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit b557deadc5cca47aff93781b21fef468233c2ea8) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| Conflicts: |
| Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt |
| --- |
| Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt |
| index 30df825d72ef..8a92b5fb3540 100644 |
| --- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt |
| +++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt |
| @@ -10,6 +10,7 @@ index in the group, from 0 to 31. |
| Required Properties: |
| |
| - compatible: Must be one of the following |
| + - "renesas,r7s72100-mstp-clocks" for R7S72100 (RZ) MSTP gate clocks |
| - "renesas,r8a7779-mstp-clocks" for R8A7779 (R-Car H1) MSTP gate clocks |
| - "renesas,r8a7790-mstp-clocks" for R8A7790 (R-Car H2) MSTP gate clocks |
| - "renesas,r8a7791-mstp-clocks" for R8A7791 (R-Car M2) MSTP gate clocks |
| -- |
| 2.1.2 |
| |