linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: shmobile: r8a7791: add EHCI clock DT support
@ 2014-04-04 23:49 Sergei Shtylyov
  2014-04-07  6:04 ` [PATCH] ARM: shmobile: r8a7791: Add EHCI MSTP clock Magnus Damm
  2014-04-07 10:30 ` [PATCH] ARM: shmobile: r8a7791: add EHCI clock DT support Laurent Pinchart
  0 siblings, 2 replies; 6+ messages in thread
From: Sergei Shtylyov @ 2014-04-04 23:49 UTC (permalink / raw)
  To: linux-arm-kernel

Add the USB EHCI clock to the R8A7791 device tree.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

---
The patch is against 'renesas-devel-3.14-20140403' tag of Simon Horman's
'renesas.git' repo.

 arch/arm/boot/dts/r8a7791.dtsi            |   25 +++++++++++++++----------
 include/dt-bindings/clock/r8a7791-clock.h |    1 +
 2 files changed, 16 insertions(+), 10 deletions(-)

Index: renesas/arch/arm/boot/dts/r8a7791.dtsi
=================================--- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi
+++ renesas/arch/arm/boot/dts/r8a7791.dtsi
@@ -774,20 +774,25 @@
 		mstp7_clks: mstp7_clks@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>,
-				 <&zs_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>,
-				 <&zx_clk>, <&zx_clk>, <&zx_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_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
+				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",
-				"scif3", "scif2", "scif1", "scif0", "du1", "du0", "lvds0";
+				"ehci", "hsusb", "hscif2", "scif5",
+				"scif4", "hscif1", "hscif0", "scif3",
+				"scif2", "scif1", "scif0", "du1",
+				"du0", "lvds0";
 		};
 		mstp8_clks: mstp8_clks@e6150990 {
 			compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
Index: renesas/include/dt-bindings/clock/r8a7791-clock.h
=================================--- renesas.orig/include/dt-bindings/clock/r8a7791-clock.h
+++ renesas/include/dt-bindings/clock/r8a7791-clock.h
@@ -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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH] ARM: shmobile: r8a7791: Add EHCI MSTP clock
  2014-04-04 23:49 [PATCH] ARM: shmobile: r8a7791: add EHCI clock DT support Sergei Shtylyov
@ 2014-04-07  6:04 ` Magnus Damm
  2014-04-07 10:25   ` Laurent Pinchart
  2014-04-07 11:16   ` Sergei Shtylyov
  2014-04-07 10:30 ` [PATCH] ARM: shmobile: r8a7791: add EHCI clock DT support Laurent Pinchart
  1 sibling, 2 replies; 6+ messages in thread
From: Magnus Damm @ 2014-04-07  6:04 UTC (permalink / raw)
  To: linux-arm-kernel

From: Magnus Damm <damm@opensource.se>

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

Signed-off-by: Magnus Damm <damm@opensource.se>
---

 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(-)

--- 0001/arch/arm/boot/dts/r8a7791.dtsi
+++ work/arch/arm/boot/dts/r8a7791.dtsi	2014-04-07 14:49:43.000000000 +0900
@@ -774,19 +774,19 @@
 		mstp7_clks: mstp7_clks@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@e6150990 {
--- 0001/include/dt-bindings/clock/r8a7791-clock.h
+++ work/include/dt-bindings/clock/r8a7791-clock.h	2014-04-07 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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] ARM: shmobile: r8a7791: Add EHCI MSTP clock
  2014-04-07  6:04 ` [PATCH] ARM: shmobile: r8a7791: Add EHCI MSTP clock Magnus Damm
@ 2014-04-07 10:25   ` Laurent Pinchart
  2014-04-07 11:16   ` Sergei Shtylyov
  1 sibling, 0 replies; 6+ messages in thread
From: Laurent Pinchart @ 2014-04-07 10:25 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Magnus,

Thank you for the patch.

On Monday 07 April 2014 15:04:21 Magnus Damm wrote:
> From: Magnus Damm <damm@opensource.se>
> 
> Add support for EHCI clock gating via the MSTP703 bit on r8a7791.
> 
> Signed-off-by: Magnus Damm <damm@opensource.se>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
> 
>  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(-)
> 
> --- 0001/arch/arm/boot/dts/r8a7791.dtsi
> +++ work/arch/arm/boot/dts/r8a7791.dtsi	2014-04-07 14:49:43.000000000 +0900
> @@ -774,19 +774,19 @@
>  		mstp7_clks: mstp7_clks@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@e6150990 {
> --- 0001/include/dt-bindings/clock/r8a7791-clock.h
> +++ work/include/dt-bindings/clock/r8a7791-clock.h	2014-04-07
> 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

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] ARM: shmobile: r8a7791: add EHCI clock DT support
  2014-04-04 23:49 [PATCH] ARM: shmobile: r8a7791: add EHCI clock DT support Sergei Shtylyov
  2014-04-07  6:04 ` [PATCH] ARM: shmobile: r8a7791: Add EHCI MSTP clock Magnus Damm
@ 2014-04-07 10:30 ` Laurent Pinchart
  1 sibling, 0 replies; 6+ messages in thread
From: Laurent Pinchart @ 2014-04-07 10:30 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Sergei,

Thank you for the patch.

On Saturday 05 April 2014 03:49:55 Sergei Shtylyov wrote:
> Add the USB EHCI clock to the R8A7791 device tree.
> 
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> 
> ---
> The patch is against 'renesas-devel-3.14-20140403' tag of Simon Horman's
> 'renesas.git' repo.
> 
>  arch/arm/boot/dts/r8a7791.dtsi            |   25 +++++++++++++++----------
>  include/dt-bindings/clock/r8a7791-clock.h |    1 +
>  2 files changed, 16 insertions(+), 10 deletions(-)
> 
> Index: renesas/arch/arm/boot/dts/r8a7791.dtsi
> =================================> --- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi
> +++ renesas/arch/arm/boot/dts/r8a7791.dtsi
> @@ -774,20 +774,25 @@
>  		mstp7_clks: mstp7_clks@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>,
> -				 <&zs_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>,
> -				 <&zx_clk>, <&zx_clk>, <&zx_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_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
> +				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",
> -				"scif3", "scif2", "scif1", "scif0", "du1", "du0", "lvds0";
> +				"ehci", "hsusb", "hscif2", "scif5",
> +				"scif4", "hscif1", "hscif0", "scif3",
> +				"scif2", "scif1", "scif0", "du1",
> +				"du0", "lvds0";
>  		};
>  		mstp8_clks: mstp8_clks@e6150990 {
>  			compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-
clocks";
> Index: renesas/include/dt-bindings/clock/r8a7791-clock.h
> =================================> --- renesas.orig/include/dt-bindings/clock/r8a7791-clock.h
> +++ renesas/include/dt-bindings/clock/r8a7791-clock.h
> @@ -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
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] ARM: shmobile: r8a7791: Add EHCI MSTP clock
  2014-04-07  6:04 ` [PATCH] ARM: shmobile: r8a7791: Add EHCI MSTP clock Magnus Damm
  2014-04-07 10:25   ` Laurent Pinchart
@ 2014-04-07 11:16   ` Sergei Shtylyov
  2014-04-08  0:29     ` Simon Horman
  1 sibling, 1 reply; 6+ messages in thread
From: Sergei Shtylyov @ 2014-04-07 11:16 UTC (permalink / raw)
  To: linux-arm-kernel

Hello.

On 07-04-2014 10:04, Magnus Damm wrote:

> From: Magnus Damm <damm@opensource.se>

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

> Signed-off-by: Magnus Damm <damm@opensource.se>

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

WBR, Sergei


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] ARM: shmobile: r8a7791: Add EHCI MSTP clock
  2014-04-07 11:16   ` Sergei Shtylyov
@ 2014-04-08  0:29     ` Simon Horman
  0 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2014-04-08  0:29 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, Apr 07, 2014 at 03:16:28PM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 07-04-2014 10:04, Magnus Damm wrote:
> 
> >From: Magnus Damm <damm@opensource.se>
> 
> >Add support for EHCI clock gating via the MSTP703 bit on r8a7791.
> 
> >Signed-off-by: Magnus Damm <damm@opensource.se>
> 
>    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.


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-04-08  0:29 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-04 23:49 [PATCH] ARM: shmobile: r8a7791: add EHCI clock DT support Sergei Shtylyov
2014-04-07  6:04 ` [PATCH] ARM: shmobile: r8a7791: Add EHCI MSTP clock Magnus Damm
2014-04-07 10:25   ` Laurent Pinchart
2014-04-07 11:16   ` Sergei Shtylyov
2014-04-08  0:29     ` Simon Horman
2014-04-07 10:30 ` [PATCH] ARM: shmobile: r8a7791: add EHCI clock DT support Laurent Pinchart

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).