diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-12-19 10:51:02 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-12-24 09:01:11 -0500 |
commit | cded80f869aef94853e056ab9c21e305b0c26138 (patch) | |
tree | b0e5e070c096c268841d6d5119b2b6404d6b7351 | |
parent | 9d90951a39205206a46609055717af9bfb436e4d (diff) |
ARM: shmobile: r8a7791: Add MSIOF clocks in device tree
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r-- | arch/arm/boot/dts/r8a7791.dtsi | 17 | ||||
-rw-r--r-- | include/dt-bindings/clock/r8a7791-clock.h | 5 |
2 files changed, 18 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi index 0a8219258145..6a29341462cf 100644 --- a/arch/arm/boot/dts/r8a7791.dtsi +++ b/arch/arm/boot/dts/r8a7791.dtsi | |||
@@ -394,6 +394,14 @@ | |||
394 | }; | 394 | }; |
395 | 395 | ||
396 | /* Gate clocks */ | 396 | /* Gate clocks */ |
397 | mstp0_clks: mstp0_clks@e6150130 { | ||
398 | compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; | ||
399 | reg = <0 0xe6150130 0 4>, <0 0xe6150030 0 4>; | ||
400 | clocks = <&mp_clk>; | ||
401 | #clock-cells = <1>; | ||
402 | renesas,clock-indices = <R8A7791_CLK_MSIOF0>; | ||
403 | clock-output-names = "msiof0"; | ||
404 | }; | ||
397 | mstp1_clks: mstp1_clks@e6150134 { | 405 | mstp1_clks: mstp1_clks@e6150134 { |
398 | compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; | 406 | compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; |
399 | reg = <0 0xe6150134 0 4>, <0 0xe6150038 0 4>; | 407 | reg = <0 0xe6150134 0 4>, <0 0xe6150038 0 4>; |
@@ -413,15 +421,16 @@ | |||
413 | compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; | 421 | compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; |
414 | reg = <0 0xe6150138 0 4>, <0 0xe6150040 0 4>; | 422 | reg = <0 0xe6150138 0 4>, <0 0xe6150040 0 4>; |
415 | clocks = <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>, | 423 | clocks = <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>, |
416 | <&mp_clk>; | 424 | <&mp_clk>, <&mp_clk>, <&mp_clk>; |
417 | #clock-cells = <1>; | 425 | #clock-cells = <1>; |
418 | renesas,clock-indices = < | 426 | renesas,clock-indices = < |
419 | R8A7791_CLK_SCIFA2 R8A7791_CLK_SCIFA1 R8A7791_CLK_SCIFA0 | 427 | R8A7791_CLK_SCIFA2 R8A7791_CLK_SCIFA1 R8A7791_CLK_SCIFA0 |
420 | R8A7791_CLK_SCIFB0 R8A7791_CLK_SCIFB1 R8A7791_CLK_SCIFB2 | 428 | R8A7791_CLK_MSIOF2 R8A7791_CLK_SCIFB0 R8A7791_CLK_SCIFB1 |
429 | R8A7791_CLK_MSIOF1 R8A7791_CLK_SCIFB2 | ||
421 | >; | 430 | >; |
422 | clock-output-names = | 431 | clock-output-names = |
423 | "scifa2", "scifa1", "scifa0", "scifb0", "scifb1", | 432 | "scifa2", "scifa1", "scifa0", "misof2", "scifb0", |
424 | "scifb2"; | 433 | "scifb1", "msiof1", "scifb2"; |
425 | }; | 434 | }; |
426 | mstp3_clks: mstp3_clks@e615013c { | 435 | mstp3_clks: mstp3_clks@e615013c { |
427 | compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; | 436 | compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; |
diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h index df1715b77f96..a69e090c83cf 100644 --- a/include/dt-bindings/clock/r8a7791-clock.h +++ b/include/dt-bindings/clock/r8a7791-clock.h | |||
@@ -21,6 +21,9 @@ | |||
21 | #define R8A7791_CLK_SD0 7 | 21 | #define R8A7791_CLK_SD0 7 |
22 | #define R8A7791_CLK_Z 8 | 22 | #define R8A7791_CLK_Z 8 |
23 | 23 | ||
24 | /* MSTP0 */ | ||
25 | #define R8A7791_CLK_MSIOF0 0 | ||
26 | |||
24 | /* MSTP1 */ | 27 | /* MSTP1 */ |
25 | #define R8A7791_CLK_TMU1 11 | 28 | #define R8A7791_CLK_TMU1 11 |
26 | #define R8A7791_CLK_TMU3 21 | 29 | #define R8A7791_CLK_TMU3 21 |
@@ -35,8 +38,10 @@ | |||
35 | #define R8A7791_CLK_SCIFA2 2 | 38 | #define R8A7791_CLK_SCIFA2 2 |
36 | #define R8A7791_CLK_SCIFA1 3 | 39 | #define R8A7791_CLK_SCIFA1 3 |
37 | #define R8A7791_CLK_SCIFA0 4 | 40 | #define R8A7791_CLK_SCIFA0 4 |
41 | #define R8A7791_CLK_MSIOF2 5 | ||
38 | #define R8A7791_CLK_SCIFB0 6 | 42 | #define R8A7791_CLK_SCIFB0 6 |
39 | #define R8A7791_CLK_SCIFB1 7 | 43 | #define R8A7791_CLK_SCIFB1 7 |
44 | #define R8A7791_CLK_MSIOF1 8 | ||
40 | #define R8A7791_CLK_SCIFB2 16 | 45 | #define R8A7791_CLK_SCIFB2 16 |
41 | #define R8A7791_CLK_DMAC 18 | 46 | #define R8A7791_CLK_DMAC 18 |
42 | 47 | ||