Skip to contentSkip to conversation

ARM: shmobile: r8a7791: Add EHCI MSTP clock

PATCH New Magnus Damm 4 participants 4 messages Apr 7, 2014 – Apr 8, 2014

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

Magnus Damm

author
#0 lore raw

PATCH 1/1 ARM: shmobile: r8a7791: Add EHCI MSTP clock

From: Magnus Damm <[email protected]>

Add support for EHCI clock gating via the MSTP703 bit on r8a7791.

Signed-off-by Magnus Damm <[email protected]>

---

Written against renesas-devel-v3.14-20140403

 arch/arm/boot/dts/r8a7791.dtsi            |    6 +++---
 include/dt-bindings/clock/r8a7791-clock.h |    1 +
 2 files changed, 4 insertions(+), 3 deletions(-)
arch/arm/boot/dts/r8a7791.dtsi +3 -3
@@ -774,19 +774,19 @@
 		mstp7_clks: mstp7_clks at e615014c {
 			compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
 			reg = <0 0xe615014c 0 4>, <0 0xe61501c4 0 4>;
-			clocks = <&mp_clk>, <&zs_clk>, <&p_clk>, <&p_clk>, <&zs_clk>,
+			clocks = <&mp_clk>,  <&mp_clk>, <&zs_clk>, <&p_clk>, <&p_clk>, <&zs_clk>,
 				 <&zs_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>,
 				 <&zx_clk>, <&zx_clk>, <&zx_clk>;
 			#clock-cells = <1>;
 			renesas,clock-indices = <
-				R8A7791_CLK_HSUSB R8A7791_CLK_HSCIF2 R8A7791_CLK_SCIF5
+				R8A7791_CLK_EHCI R8A7791_CLK_HSUSB R8A7791_CLK_HSCIF2 R8A7791_CLK_SCIF5
 				R8A7791_CLK_SCIF4 R8A7791_CLK_HSCIF1 R8A7791_CLK_HSCIF0
 				R8A7791_CLK_SCIF3 R8A7791_CLK_SCIF2 R8A7791_CLK_SCIF1
 				R8A7791_CLK_SCIF0 R8A7791_CLK_DU1 R8A7791_CLK_DU0
 				R8A7791_CLK_LVDS0
 			>;
 			clock-output-names =
-				"hsusb", "hscif2", "scif5", "scif4", "hscif1", "hscif0",
+				"ehci", "hsusb", "hscif2", "scif5", "scif4", "hscif1", "hscif0",
 				"scif3", "scif2", "scif1", "scif0", "du1", "du0", "lvds0";
 		};
 		mstp8_clks: mstp8_clks at e6150990 {
include/dt-bindings/clock/r8a7791-clock.h +1 -0
@@ -63,6 +63,7 @@
 #define R8A7791_CLK_PWM			23
 
 /* MSTP7 */
+#define R8A7791_CLK_EHCI		3
 #define R8A7791_CLK_HSUSB		4
 #define R8A7791_CLK_HSCIF2		13
 #define R8A7791_CLK_SCIF5		14
#1 lore raw

PATCH 1/1 ARM: shmobile: r8a7791: Add EHCI MSTP clock

Hi Magnus,

Thank you for the patch.

Quoted 5 lines · On Monday 07 April 2014 15:04:21 Magnus Damm wrote:

From: Magnus Damm <[email protected]>

Add support for EHCI clock gating via the MSTP703 bit on r8a7791.

Signed-off-by Magnus Damm <[email protected]>
Acked-by Laurent Pinchart <[email protected]>

arch/arm/boot/dts/r8a7791.dtsi line 775

Quoted 13 lines

---

Written against renesas-devel-v3.14-20140403

 arch/arm/boot/dts/r8a7791.dtsi            |    6 +++---
 include/dt-bindings/clock/r8a7791-clock.h |    1 +
 2 files changed, 4 insertions(+), 3 deletions(-)
arch/arm/boot/dts/r8a7791.dtsi +0 -0
@@ -774,19 +774,19 @@
 		mstp7_clks: mstp7_clks at e615014c {
 			compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-

clocks";

arch/arm/boot/dts/r8a7791.dtsi

Quoted 9 lines
arch/arm/boot/dts/r8a7791.dtsi +2 -2
 			reg = <0 0xe615014c 0 4>, <0 0xe61501c4 0 4>;
-			clocks = <&mp_clk>, <&zs_clk>, <&p_clk>, <&p_clk>, <&zs_clk>,
+			clocks = <&mp_clk>,  <&mp_clk>, <&zs_clk>, <&p_clk>, <&p_clk>,
 <&zs_clk>, <&zs_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>,
 				 <&zx_clk>, <&zx_clk>, <&zx_clk>;
 			#clock-cells = <1>;
 			renesas,clock-indices = <
-				R8A7791_CLK_HSUSB R8A7791_CLK_HSCIF2 R8A7791_CLK_SCIF5
+				R8A7791_CLK_EHCI R8A7791_CLK_HSUSB R8A7791_CLK_HSCIF2

R8A7791_CLK_SCIF5

arch/arm/boot/dts/r8a7791.dtsi

Quoted 10 lines

R8A7791_CLK_SCIF4 R8A7791_CLK_HSCIF1 R8A7791_CLK_HSCIF0

arch/arm/boot/dts/r8a7791.dtsi +1 -1
 				R8A7791_CLK_SCIF3 R8A7791_CLK_SCIF2 R8A7791_CLK_SCIF1
 				R8A7791_CLK_SCIF0 R8A7791_CLK_DU1 R8A7791_CLK_DU0
 				R8A7791_CLK_LVDS0
 
 			>;
 
 			clock-output-names =
-				"hsusb", "hscif2", "scif5", "scif4", "hscif1", "hscif0",
+				"ehci", "hsusb", "hscif2", "scif5", "scif4", "hscif1",

"hscif0",

Quoted 13 lines
arch/arm/boot/dts/r8a7791.dtsi +0 -0
 				"scif3", "scif2", "scif1", "scif0", "du1", "du0", "lvds0";
 		};
 		mstp8_clks: mstp8_clks at e6150990 {
include/dt-bindings/clock/r8a7791-clock.h +0 -0

14:49:43.000000000 +0900 @@ -63,6 +63,7 @@
#define R8A7791_CLK_PWM 23

/* MSTP7 */
+#define R8A7791_CLK_EHCI 3
#define R8A7791_CLK_HSUSB 4
#define R8A7791_CLK_HSCIF2 13
#define R8A7791_CLK_SCIF5 14

Signature · 3 lines
Regards,

Laurent Pinchart
#3 lore raw

PATCH 1/1 ARM: shmobile: r8a7791: Add EHCI MSTP clock

Quoted 11 lines · Sergei Shtylyov

Hello.

Quoted 5 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Add support for EHCI clock gating via the MSTP703 bit on r8a7791.

Signed-off-by Magnus Damm <[email protected]>

I have already posted such patch at end of the last week.

Thanks for giving me the luxury of having two patches to choose from:
much better than none. I regret that there could only be one winner :^)

Ordinarily I would take the first one, Sergei's. But I have decided to take Magnus's as it is simpler due to not cleaning
up the code at the same time as adding the feature described on the wrapper.