aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikhail Ulyanov <mikhail.ulyanov@cogentembedded.com>2014-08-19 08:50:51 -0400
committerSimon Horman <horms+renesas@verge.net.au>2014-08-21 21:56:33 -0400
commited48b5d6fd339d145df5a6a1e48cf56ef265cf4f (patch)
tree8fc3609f04a0745df77b9f7a1696faf91c807e56
parentda076a888ab19f13816372796ed231e7d6ff5fed (diff)
ARM: shmobile: r8a7791: Add JPU clock dt and CPG define.
Signed-off-by: Mikhail Ulyanov <mikhail.ulyanov@cogentembedded.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r--arch/arm/boot/dts/r8a7791.dtsi6
-rw-r--r--include/dt-bindings/clock/r8a7791-clock.h1
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index f26226e054b3..d62c237e137d 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -857,16 +857,16 @@
857 mstp1_clks: mstp1_clks@e6150134 { 857 mstp1_clks: mstp1_clks@e6150134 {
858 compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; 858 compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
859 reg = <0 0xe6150134 0 4>, <0 0xe6150038 0 4>; 859 reg = <0 0xe6150134 0 4>, <0 0xe6150038 0 4>;
860 clocks = <&p_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>, 860 clocks = <&m2_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>,
861 <&cp_clk>, <&zs_clk>, <&zs_clk>, <&zs_clk>; 861 <&cp_clk>, <&zs_clk>, <&zs_clk>, <&zs_clk>;
862 #clock-cells = <1>; 862 #clock-cells = <1>;
863 renesas,clock-indices = < 863 renesas,clock-indices = <
864 R8A7791_CLK_TMU1 R8A7791_CLK_TMU3 R8A7791_CLK_TMU2 864 R8A7791_CLK_JPU R8A7791_CLK_TMU1 R8A7791_CLK_TMU3 R8A7791_CLK_TMU2
865 R8A7791_CLK_CMT0 R8A7791_CLK_TMU0 R8A7791_CLK_VSP1_DU1 865 R8A7791_CLK_CMT0 R8A7791_CLK_TMU0 R8A7791_CLK_VSP1_DU1
866 R8A7791_CLK_VSP1_DU0 R8A7791_CLK_VSP1_S 866 R8A7791_CLK_VSP1_DU0 R8A7791_CLK_VSP1_S
867 >; 867 >;
868 clock-output-names = 868 clock-output-names =
869 "tmu1", "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1", 869 "jpu", "tmu1", "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1",
870 "vsp1-du0", "vsp1-sy"; 870 "vsp1-du0", "vsp1-sy";
871 }; 871 };
872 mstp2_clks: mstp2_clks@e6150138 { 872 mstp2_clks: mstp2_clks@e6150138 {
diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h
index f0d4d1049162..58c3f49d068c 100644
--- a/include/dt-bindings/clock/r8a7791-clock.h
+++ b/include/dt-bindings/clock/r8a7791-clock.h
@@ -25,6 +25,7 @@
25#define R8A7791_CLK_MSIOF0 0 25#define R8A7791_CLK_MSIOF0 0
26 26
27/* MSTP1 */ 27/* MSTP1 */
28#define R8A7791_CLK_JPU 6
28#define R8A7791_CLK_TMU1 11 29#define R8A7791_CLK_TMU1 11
29#define R8A7791_CLK_TMU3 21 30#define R8A7791_CLK_TMU3 21
30#define R8A7791_CLK_TMU2 22 31#define R8A7791_CLK_TMU2 22