Skip to contentSkip to conversation

arm64: renesas: r8a7795 dtsi: Update common divider clocks

RFC PATCH In review Magnus Damm 3 participants 3 messages Sep 8, 2015 – Sep 9, 2015

Subsystems (3)
lore
Share & tools
lore

Magnus Damm

author maintainer
#0 lore raw

RFC PATCH 1/1 arm64: renesas: r8a7795 dtsi: Update common divider clocks

From: Magnus Damm <[email protected]>

Update the r8a7795 CPG DTS to include pll1_div2. In older r8a7795 CPG CCF driver implementations the output of PLL1 was divided by two.

To support r8a7795 clocks like RPCSRC the PLL1 has now been converted to not divide by two in the V7 CPG series, so when that series is used we have to divide by two using a fixed divider outside the CPG.

---

This fixes the PLL1 output in the V9 integration series:
[PATCH v9 00/07][RFC] Renesas R-Car H3 (r8a7795) integration patches V9

With this patch V9 integration series below will work with V7 CPG:
[PATCH v7 00/05] Renesas R-Car Gen3 CPG support V7

 arch/arm64/boot/dts/renesas/r8a7795.dtsi |   27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)
arch/arm64/boot/dts/renesas/r8a7795.dtsi +18 -9
@@ -70,17 +70,26 @@
 			#clock-cells = <1>;
 			ranges;
 
-			zt_clk: zt {
+			/* Fixed factor clocks */
+			pll1_div2_clk: pll1_div2 {
 				compatible = "fixed-factor-clock";
 				clocks = <&cpg_clocks R8A7795_CLK_PLL1>;
 				#clock-cells = <0>;
+				clock-div = <2>;
+				clock-mult = <1>;
+			};
+
+			zt_clk: zt {
+				compatible = "fixed-factor-clock";
+				clocks = <&pll1_div2_clk>;
+				#clock-cells = <0>;
 				clock-div = <4>;
 				clock-mult = <1>;
 			};
 
 			ztr_clk: ztr {
 				compatible = "fixed-factor-clock";
-				clocks = <&cpg_clocks R8A7795_CLK_PLL1>;
+				clocks = <&pll1_div2_clk>;
 				#clock-cells = <0>;
 				clock-div = <6>;
 				clock-mult = <1>;
@@ -88,7 +97,7 @@
 
 			ztrd2_clk: ztrd2 {
 				compatible = "fixed-factor-clock";
-				clocks = <&cpg_clocks R8A7795_CLK_PLL1>;
+				clocks = <&pll1_div2_clk>;
 				#clock-cells = <0>;
 				clock-div = <12>;
 				clock-mult = <1>;
@@ -96,7 +105,7 @@
 
 			zx_clk: zx {
 				compatible = "fixed-factor-clock";
-				clocks = <&cpg_clocks R8A7795_CLK_PLL1>;
+				clocks = <&pll1_div2_clk>;
 				#clock-cells = <0>;
 				clock-div = <2>;
 				clock-mult = <1>;
@@ -104,7 +113,7 @@
 
 			s0_clk: s0 {
 				compatible = "fixed-factor-clock";
-				clocks = <&cpg_clocks R8A7795_CLK_PLL1>;
+				clocks = <&pll1_div2_clk>;
 				#clock-cells = <0>;
 				clock-div = <2>;
 				clock-mult = <1>;
@@ -128,7 +137,7 @@
 
 			s1_clk: s1 {
 				compatible = "fixed-factor-clock";
-				clocks = <&cpg_clocks R8A7795_CLK_PLL1>;
+				clocks = <&pll1_div2_clk>;
 				#clock-cells = <0>;
 				clock-div = <3>;
 				clock-mult = <1>;
@@ -160,7 +169,7 @@
 
 			s2_clk: s2 {
 				compatible = "fixed-factor-clock";
-				clocks = <&cpg_clocks R8A7795_CLK_PLL1>;
+				clocks = <&pll1_div2_clk>;
 				#clock-cells = <0>;
 				clock-div = <4>;
 				clock-mult = <1>;
@@ -192,7 +201,7 @@
 
 			s3_clk: s3 {
 				compatible = "fixed-factor-clock";
-				clocks = <&cpg_clocks R8A7795_CLK_PLL1>;
+				clocks = <&pll1_div2_clk>;
 				#clock-cells = <0>;
 				clock-div = <6>;
 				clock-mult = <1>;
@@ -224,7 +233,7 @@
 
 			cl_clk: cl {
 				compatible = "fixed-factor-clock";
-				clocks = <&cpg_clocks R8A7795_CLK_PLL1>;
+				clocks = <&pll1_div2_clk>;
 				#clock-cells = <0>;
 				clock-div = <48>;
 				clock-mult = <1>;
Acked-by on v1 1/1
#1 lore raw

Hi Magnus,

Quoted 8 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Update the r8a7795 CPG DTS to include pll1_div2. In older r8a7795 CPG CCF driver implementations the output of PLL1 was divided by two.

To support r8a7795 clocks like RPCSRC the PLL1 has now been converted to not divide by two in the V7 CPG series, so when that series is used we have to divide by two using a fixed divider outside the CPG.

Thanks!

Quoted 1 line

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#2 lore raw
In reply to Magnus Damm
Quoted 10 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Update the r8a7795 CPG DTS to include pll1_div2. In older r8a7795 CPG CCF driver implementations the output of PLL1 was divided by two.

To support r8a7795 clocks like RPCSRC the PLL1 has now been converted to not divide by two in the V7 CPG series, so when that series is used we have to divide by two using a fixed divider outside the CPG.

Quoted 8 lines

---

This fixes the PLL1 output in the V9 integration series:
[PATCH v9 00/07][RFC] Renesas R-Car H3 (r8a7795) integration patches V9

With this patch V9 integration series below will work with V7 CPG:
[PATCH v7 00/05] Renesas R-Car Gen3 CPG support V7

 1 file changed, 18 insertions(+), 9 deletions(-)

Thanks,

I have pushed this patch to the renesas tree in a new topic branch, topic/arm64-rcar-gen3-v9.plus, which is based on topic/arm64-rcar-gen3-v9.

I am assuming you will include this in/squash this into the next posting of "Renesas R-Car H3 (r8a7795) integration patches".

Disclaimer: To be quite clear none of these patches are queued up for mainline yet and as such they are not included in the next or devel branches of the renesas tree.