diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-05-12 19:55:33 -0400 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-05-12 19:55:33 -0400 |
| commit | e07b2b59c98b79a116254ce61afa76d4702ea6c5 (patch) | |
| tree | c1f66b8929e976e8537ae16f6f5b59eb03d96306 /Documentation | |
| parent | 95713978b0a2929b72933235bb07c0a793e71afa (diff) | |
| parent | 8e33f91a0b84ae1964bef77cb92f5d41d97530c8 (diff) | |
Merge branch 'clk-fixes' into clk-next
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt index 5992dceec7af..02a25d99ca61 100644 --- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt +++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt | |||
| @@ -43,7 +43,7 @@ Example | |||
| 43 | clock-output-names = | 43 | clock-output-names = |
| 44 | "tpu0", "mmcif1", "sdhi3", "sdhi2", | 44 | "tpu0", "mmcif1", "sdhi3", "sdhi2", |
| 45 | "sdhi1", "sdhi0", "mmcif0"; | 45 | "sdhi1", "sdhi0", "mmcif0"; |
| 46 | renesas,clock-indices = < | 46 | clock-indices = < |
| 47 | R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3 | 47 | R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3 |
| 48 | R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0 | 48 | R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0 |
| 49 | R8A7790_CLK_MMCIF0 | 49 | R8A7790_CLK_MMCIF0 |