aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2013-12-19 10:51:01 -0500
committerSimon Horman <horms+renesas@verge.net.au>2013-12-24 09:01:11 -0500
commit9d90951a39205206a46609055717af9bfb436e4d (patch)
tree43852ba3da9228b6da09cc59da93131e346933cf
parent82f7c2065a363cd3c0c84d3c9b59ee47897c5ebb (diff)
ARM: shmobile: r8a7790: 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/r8a7790.dtsi17
-rw-r--r--include/dt-bindings/clock/r8a7790-clock.h6
2 files changed, 19 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 71ec31c6d9b6..9c9a9920acce 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -524,6 +524,14 @@
524 }; 524 };
525 525
526 /* Gate clocks */ 526 /* Gate clocks */
527 mstp0_clks: mstp0_clks@e6150130 {
528 compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
529 reg = <0 0xe6150130 0 4>, <0 0xe6150030 0 4>;
530 clocks = <&mp_clk>;
531 #clock-cells = <1>;
532 renesas,clock-indices = <R8A7790_CLK_MSIOF0>;
533 clock-output-names = "msiof0";
534 };
527 mstp1_clks: mstp1_clks@e6150134 { 535 mstp1_clks: mstp1_clks@e6150134 {
528 compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks"; 536 compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
529 reg = <0 0xe6150134 0 4>, <0 0xe6150038 0 4>; 537 reg = <0 0xe6150134 0 4>, <0 0xe6150038 0 4>;
@@ -544,15 +552,16 @@
544 compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks"; 552 compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
545 reg = <0 0xe6150138 0 4>, <0 0xe6150040 0 4>; 553 reg = <0 0xe6150138 0 4>, <0 0xe6150040 0 4>;
546 clocks = <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>, 554 clocks = <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>,
547 <&mp_clk>; 555 <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>;
548 #clock-cells = <1>; 556 #clock-cells = <1>;
549 renesas,clock-indices = < 557 renesas,clock-indices = <
550 R8A7790_CLK_SCIFA2 R8A7790_CLK_SCIFA1 R8A7790_CLK_SCIFA0 558 R8A7790_CLK_SCIFA2 R8A7790_CLK_SCIFA1 R8A7790_CLK_SCIFA0
551 R8A7790_CLK_SCIFB0 R8A7790_CLK_SCIFB1 R8A7790_CLK_SCIFB2 559 R8A7790_CLK_MSIOF2 R8A7790_CLK_SCIFB0 R8A7790_CLK_SCIFB1
560 R8A7790_CLK_MSIOF1 R8A7790_CLK_MSIOF3 R8A7790_CLK_SCIFB2
552 >; 561 >;
553 clock-output-names = 562 clock-output-names =
554 "scifa2", "scifa1", "scifa0", "scifb0", "scifb1", 563 "scifa2", "scifa1", "scifa0", "msiof2", "scifb0",
555 "scifb2"; 564 "scifb1", "msiof1", "msiof3", "scifb2";
556 }; 565 };
557 mstp3_clks: mstp3_clks@e615013c { 566 mstp3_clks: mstp3_clks@e615013c {
558 compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks"; 567 compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
diff --git a/include/dt-bindings/clock/r8a7790-clock.h b/include/dt-bindings/clock/r8a7790-clock.h
index 420f0b00ae1e..bbabb8e80113 100644
--- a/include/dt-bindings/clock/r8a7790-clock.h
+++ b/include/dt-bindings/clock/r8a7790-clock.h
@@ -22,6 +22,9 @@
22#define R8A7790_CLK_SD1 8 22#define R8A7790_CLK_SD1 8
23#define R8A7790_CLK_Z 9 23#define R8A7790_CLK_Z 9
24 24
25/* MSTP0 */
26#define R8A7790_CLK_MSIOF0 0
27
25/* MSTP1 */ 28/* MSTP1 */
26#define R8A7790_CLK_TMU1 11 29#define R8A7790_CLK_TMU1 11
27#define R8A7790_CLK_TMU3 21 30#define R8A7790_CLK_TMU3 21
@@ -37,8 +40,11 @@
37#define R8A7790_CLK_SCIFA2 2 40#define R8A7790_CLK_SCIFA2 2
38#define R8A7790_CLK_SCIFA1 3 41#define R8A7790_CLK_SCIFA1 3
39#define R8A7790_CLK_SCIFA0 4 42#define R8A7790_CLK_SCIFA0 4
43#define R8A7790_CLK_MSIOF2 5
40#define R8A7790_CLK_SCIFB0 6 44#define R8A7790_CLK_SCIFB0 6
41#define R8A7790_CLK_SCIFB1 7 45#define R8A7790_CLK_SCIFB1 7
46#define R8A7790_CLK_MSIOF1 8
47#define R8A7790_CLK_MSIOF3 15
42#define R8A7790_CLK_SCIFB2 16 48#define R8A7790_CLK_SCIFB2 16
43#define R8A7790_CLK_SYS_DMAC0 18 49#define R8A7790_CLK_SYS_DMAC0 18
44#define R8A7790_CLK_SYS_DMAC1 19 50#define R8A7790_CLK_SYS_DMAC1 19