Skip to contentSkip to conversation

ARM: shmobile: r8a7790: add MLB+ clock

PATCH New Sergei Shtylyov 2 participants 4 messages Dec 18, 2014 – Dec 23, 2014

Subsystems (3)
Device tree bindings Common clk SuperH
lore
Share & tools
lore

Sergei Shtylyov

author
#0 lore raw

PATCH 1/1 ARM: shmobile: r8a7790: add MLB+ clock

From: Andrey Gusakov <[email protected]>

Add MLB+ clock to R8A7790 device tree.

Signed-off-by Andrey Gusakov <[email protected]>
[Sergei: rebased, renamed, added changelog]
Signed-off-by Sergei Shtylyov <[email protected]>

---
This patch is against 'renesas-devel-20141218-v3.18' tag of Simon Horman's 'renesas.git' repo.

 arch/arm/boot/dts/r8a7790.dtsi            |   13 +++++++------
 include/dt-bindings/clock/r8a7790-clock.h |    1 +
 2 files changed, 8 insertions(+), 6 deletions(-)
arch/arm/boot/dts/r8a7790.dtsi +7 -6
Index: renesas/arch/arm/boot/dts/r8a7790.dtsi
===================================================================
@@ -1149,16 +1149,17 @@
 		mstp8_clks: mstp8_clks at e6150990 {
 			compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
 			reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>;
-			clocks = <&zg_clk>, <&zg_clk>, <&zg_clk>, <&zg_clk>, <&p_clk>,
-				 <&zs_clk>, <&zs_clk>;
+			clocks = <&hp_clk>, <&zg_clk>, <&zg_clk>, <&zg_clk>,
+			         <&zg_clk>, <&p_clk>, <&zs_clk>, <&zs_clk>;
 			#clock-cells = <1>;
 			clock-indices = <
-				R8A7790_CLK_VIN3 R8A7790_CLK_VIN2 R8A7790_CLK_VIN1
-				R8A7790_CLK_VIN0 R8A7790_CLK_ETHER R8A7790_CLK_SATA1
-				R8A7790_CLK_SATA0
+				R8A7790_CLK_MLB R8A7790_CLK_VIN3 R8A7790_CLK_VIN2
+				R8A7790_CLK_VIN1 R8A7790_CLK_VIN0 R8A7790_CLK_ETHER
+				R8A7790_CLK_SATA1 R8A7790_CLK_SATA0
 			>;
 			clock-output-names =
-				"vin3", "vin2", "vin1", "vin0", "ether", "sata1", "sata0";
+				"mlb", "vin3", "vin2", "vin1", "vin0", "ether",
+				"sata1", "sata0";
 		};
 		mstp9_clks: mstp9_clks at e6150994 {
 			compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
include/dt-bindings/clock/r8a7790-clock.h +1 -0
Index: renesas/include/dt-bindings/clock/r8a7790-clock.h
===================================================================
@@ -97,6 +97,7 @@
 #define R8A7790_CLK_LVDS0		26
 
 /* MSTP8 */
+#define R8A7790_CLK_MLB		2
 #define R8A7790_CLK_VIN3		8
 #define R8A7790_CLK_VIN2		9
 #define R8A7790_CLK_VIN1		10
#1 lore raw

PATCH 1/1 ARM: shmobile: r8a7790: add MLB+ clock

Quoted 11 lines · Sergei Shtylyov

From: Andrey Gusakov <[email protected]>

Add MLB+ clock to R8A7790 device tree.

Signed-off-by Andrey Gusakov <[email protected]>
[Sergei: rebased, renamed, added changelog]
Signed-off-by Sergei Shtylyov <[email protected]>

---
This patch is against 'renesas-devel-20141218-v3.18' tag of Simon Horman's 'renesas.git' repo.

Thanks, I have queued this up.

Quoted 46 lines
 arch/arm/boot/dts/r8a7790.dtsi            |   13 +++++++------
 include/dt-bindings/clock/r8a7790-clock.h |    1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

Index: renesas/arch/arm/boot/dts/r8a7790.dtsi
===================================================================

arch/arm/boot/dts/r8a7790.dtsi +7 -6
@@ -1149,16 +1149,17 @@
 		mstp8_clks: mstp8_clks at e6150990 {
 			compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
 			reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>;
-			clocks = <&zg_clk>, <&zg_clk>, <&zg_clk>, <&zg_clk>, <&p_clk>,
-				 <&zs_clk>, <&zs_clk>;
+			clocks = <&hp_clk>, <&zg_clk>, <&zg_clk>, <&zg_clk>,
+			         <&zg_clk>, <&p_clk>, <&zs_clk>, <&zs_clk>;
 			#clock-cells = <1>;
 			clock-indices = <
-				R8A7790_CLK_VIN3 R8A7790_CLK_VIN2 R8A7790_CLK_VIN1
-				R8A7790_CLK_VIN0 R8A7790_CLK_ETHER R8A7790_CLK_SATA1
-				R8A7790_CLK_SATA0
+				R8A7790_CLK_MLB R8A7790_CLK_VIN3 R8A7790_CLK_VIN2
+				R8A7790_CLK_VIN1 R8A7790_CLK_VIN0 R8A7790_CLK_ETHER
+				R8A7790_CLK_SATA1 R8A7790_CLK_SATA0
 			>;
 			clock-output-names =
-				"vin3", "vin2", "vin1", "vin0", "ether", "sata1", "sata0";
+				"mlb", "vin3", "vin2", "vin1", "vin0", "ether",
+				"sata1", "sata0";
 		};
 		mstp9_clks: mstp9_clks at e6150994 {
 			compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";

Index: renesas/include/dt-bindings/clock/r8a7790-clock.h
===================================================================

include/dt-bindings/clock/r8a7790-clock.h +1 -0
@@ -97,6 +97,7 @@
 #define R8A7790_CLK_LVDS0		26
 
 /* MSTP8 */
+#define R8A7790_CLK_MLB		2
 #define R8A7790_CLK_VIN3		8
 #define R8A7790_CLK_VIN2		9
 #define R8A7790_CLK_VIN1		10
author
#2 lore raw

PATCH 1/1 ARM: shmobile: r8a7790: add MLB+ clock

Quoted 8 lines · Simon Horman
Quoted 7 lines

From: Andrey Gusakov <[email protected]>

Add MLB+ clock to R8A7790 device tree.

Signed-off-by Andrey Gusakov <[email protected]>
[Sergei: rebased, renamed, added changelog]
Signed-off-by Sergei Shtylyov <[email protected]>
Quoted 5 lines
Quoted 3 lines

---
This patch is against 'renesas-devel-20141218-v3.18' tag of Simon Horman's 'renesas.git' repo.

Thanks, I have queued this up.

Oops, just saw a formatting issue in this patch...

[...]

Quoted 9 lines

include/dt-bindings/clock/r8a7790-clock.h line 100

Quoted 9 lines

Index: renesas/include/dt-bindings/clock/r8a7790-clock.h
===================================================================

include/dt-bindings/clock/r8a7790-clock.h +1 -0
@@ -97,6 +97,7 @@
  #define R8A7790_CLK_LVDS0		26
 
  /* MSTP8 */
+#define R8A7790_CLK_MLB		2

Need one more tab here.

Quoted 3 lines

include/dt-bindings/clock/r8a7790-clock.h line 103

Quoted 3 lines
include/dt-bindings/clock/r8a7790-clock.h +0 -0
  #define R8A7790_CLK_VIN3		8
  #define R8A7790_CLK_VIN2		9
  #define R8A7790_CLK_VIN1		10

Perhaps you still can fix it up, or I can resend? I'm not seeing this
patch in the 'devel' branch yet...

WBR, Sergei

#3 lore raw

PATCH 1/1 ARM: shmobile: r8a7790: add MLB+ clock

Hi Sergei,

Quoted 31 lines · Sergei Shtylyov
Quoted 8 lines · Simon Horman
Quoted 7 lines

From: Andrey Gusakov <[email protected]>

Add MLB+ clock to R8A7790 device tree.

Signed-off-by Andrey Gusakov <[email protected]>
[Sergei: rebased, renamed, added changelog]
Signed-off-by Sergei Shtylyov <[email protected]>
Quoted 5 lines
Quoted 3 lines

---
This patch is against 'renesas-devel-20141218-v3.18' tag of Simon Horman's 'renesas.git' repo.

Thanks, I have queued this up.

Oops, just saw a formatting issue in this patch...

[...]

Quoted 9 lines

include/dt-bindings/clock/r8a7790-clock.h line 100

Quoted 9 lines

Index: renesas/include/dt-bindings/clock/r8a7790-clock.h
===================================================================

include/dt-bindings/clock/r8a7790-clock.h +1 -0
@@ -97,6 +97,7 @@
 #define R8A7790_CLK_LVDS0		26
 
 /* MSTP8 */
+#define R8A7790_CLK_MLB		2

Need one more tab here.

Quoted 6 lines
Quoted 3 lines

include/dt-bindings/clock/r8a7790-clock.h line 103

Quoted 3 lines
include/dt-bindings/clock/r8a7790-clock.h +0 -0
 #define R8A7790_CLK_VIN3		8
 #define R8A7790_CLK_VIN2		9
 #define R8A7790_CLK_VIN1		10

Perhaps you still can fix it up, or I can resend? I'm not seeing this
patch in the 'devel' branch yet...

Thanks for following up on this.

I had the patch queued up locally but it seems that I forgot to push them.

I have fixed up this patch by adding an extra tab and pushed the result. The result should be in renesas-devel-20141223-v3.19-rc1 (But kernel.org seems slow today).

Please let me know if I messed things up somehow.