linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/3] ARM: shmobile: r8a7794: Add VIN, SGX, MMP and VSP1 to device tree
@ 2014-10-30  5:58 Simon Horman
  2014-10-30  5:58 ` [PATCH 1/3] ARM: shmobile: r8a7794: Add SGX clock " Simon Horman
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Simon Horman @ 2014-10-30  5:58 UTC (permalink / raw)
  To: linux-arm-kernel

Hi,

this short series adds VIN, SGX, MMP and VSP1 clocks to device
tree for the r8a7794 SoC

Based on the renesas-devel-20141030-v3.18-rc2 branch of my renesas tree

Compile tested only


Koji Matsuoka (1):
  ARM: shmobile: r8a7794: Add VIN clock to device tree

Kouei Abe (1):
  ARM: shmobile: r8a7794: Add SGX clock to device tree

Yoshifumi Hosoya (1):
  ARM: shmobile: r8a7794: Add MMP and VSP1 clocks to device tree

 arch/arm/boot/dts/r8a7794.dtsi            | 21 ++++++++++++---------
 include/dt-bindings/clock/r8a7794-clock.h |  9 +++++++++
 2 files changed, 21 insertions(+), 9 deletions(-)

-- 
2.1.1

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

* [PATCH 1/3] ARM: shmobile: r8a7794: Add SGX clock to device tree
  2014-10-30  5:58 [PATCH 0/3] ARM: shmobile: r8a7794: Add VIN, SGX, MMP and VSP1 to device tree Simon Horman
@ 2014-10-30  5:58 ` Simon Horman
  2014-10-30  9:54   ` Geert Uytterhoeven
  2014-10-30  5:58 ` [PATCH 2/3] ARM: shmobile: r8a7794: Add VIN " Simon Horman
  2014-10-30  5:58 ` [PATCH 3/3] ARM: shmobile: r8a7794: Add MMP and VSP1 clocks " Simon Horman
  2 siblings, 1 reply; 8+ messages in thread
From: Simon Horman @ 2014-10-30  5:58 UTC (permalink / raw)
  To: linux-arm-kernel

From: Kouei Abe <kouei.abe.cp@renesas.com>

Signed-off-by: Kouei Abe <kouei.abe.cp@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7794.dtsi            | 11 +++++------
 include/dt-bindings/clock/r8a7794-clock.h |  1 +
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index 088e79c..d348dee 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -461,16 +461,15 @@
 		mstp1_clks: mstp1_clks at e6150134 {
 			compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
 			reg = <0 0xe6150134 0 4>, <0 0xe6150038 0 4>;
-			clocks = <&p_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>,
-				 <&cp_clk>,
-				 <&zs_clk>, <&zs_clk>, <&zs_clk>;
+			clocks = <&p_clk>, <&zg_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>,
+				 <&cp_clk>, <&zs_clk>, <&zs_clk>, <&zs_clk>;
 			#clock-cells = <1>;
 			renesas,clock-indices = <
-				R8A7794_CLK_TMU1 R8A7794_CLK_TMU3 R8A7794_CLK_TMU2
-				R8A7794_CLK_CMT0 R8A7794_CLK_TMU0
+				R8A7794_CLK_TMU1 R8A7794_CLK_PVRSRVKM R8A7794_CLK_TMU3
+				R8A7794_CLK_TMU2 R8A7794_CLK_CMT0 R8A7794_CLK_TMU0
 			>;
 			clock-output-names =
-				"tmu1", "tmu3", "tmu2", "cmt0", "tmu0";
+				"tmu1", "pvrsrvkm", "tmu3", "tmu2", "cmt0", "tmu0";
 		};
 		mstp2_clks: mstp2_clks at e6150138 {
 			compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h
index 9ac1043..29a6789 100644
--- a/include/dt-bindings/clock/r8a7794-clock.h
+++ b/include/dt-bindings/clock/r8a7794-clock.h
@@ -27,6 +27,7 @@
 
 /* MSTP1 */
 #define R8A7794_CLK_TMU1		11
+#define R8A7794_CLK_PVRSRVKM		12
 #define R8A7794_CLK_TMU3		21
 #define R8A7794_CLK_TMU2		22
 #define R8A7794_CLK_CMT0		24
-- 
2.1.1

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

* [PATCH 2/3] ARM: shmobile: r8a7794: Add VIN clock to device tree
  2014-10-30  5:58 [PATCH 0/3] ARM: shmobile: r8a7794: Add VIN, SGX, MMP and VSP1 to device tree Simon Horman
  2014-10-30  5:58 ` [PATCH 1/3] ARM: shmobile: r8a7794: Add SGX clock " Simon Horman
@ 2014-10-30  5:58 ` Simon Horman
  2014-11-04  0:10   ` Simon Horman
  2014-10-30  5:58 ` [PATCH 3/3] ARM: shmobile: r8a7794: Add MMP and VSP1 clocks " Simon Horman
  2 siblings, 1 reply; 8+ messages in thread
From: Simon Horman @ 2014-10-30  5:58 UTC (permalink / raw)
  To: linux-arm-kernel

From: Koji Matsuoka <koji.matsuoka.xm@renesas.com>

Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7794.dtsi            | 6 +++---
 include/dt-bindings/clock/r8a7794-clock.h | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index d348dee..08c50c8 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -516,13 +516,13 @@
 		mstp8_clks: mstp8_clks at e6150990 {
 			compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
 			reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>;
-			clocks = <&p_clk>;
+			clocks = <&zg_clk>, <&zg_clk>, <&p_clk>;
 			#clock-cells = <1>;
 			renesas,clock-indices = <
-				R8A7794_CLK_ETHER
+				R8A7794_CLK_VIN1 R8A7794_CLK_VIN0 R8A7794_CLK_ETHER
 			>;
 			clock-output-names =
-				"ether";
+				"vin1", "vin0", "ether";
 		};
 		mstp11_clks: mstp11_clks at e615099c {
 			compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h
index 29a6789..7d49531 100644
--- a/include/dt-bindings/clock/r8a7794-clock.h
+++ b/include/dt-bindings/clock/r8a7794-clock.h
@@ -62,6 +62,8 @@
 #define R8A7794_CLK_SCIF0		21
 
 /* MSTP8 */
+#define R8A7794_CLK_VIN1		10
+#define R8A7794_CLK_VIN0		11
 #define R8A7794_CLK_ETHER		13
 
 /* MSTP9 */
-- 
2.1.1

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

* [PATCH 3/3] ARM: shmobile: r8a7794: Add MMP and VSP1 clocks to device tree
  2014-10-30  5:58 [PATCH 0/3] ARM: shmobile: r8a7794: Add VIN, SGX, MMP and VSP1 to device tree Simon Horman
  2014-10-30  5:58 ` [PATCH 1/3] ARM: shmobile: r8a7794: Add SGX clock " Simon Horman
  2014-10-30  5:58 ` [PATCH 2/3] ARM: shmobile: r8a7794: Add VIN " Simon Horman
@ 2014-10-30  5:58 ` Simon Horman
  2014-10-30 10:01   ` Geert Uytterhoeven
  2 siblings, 1 reply; 8+ messages in thread
From: Simon Horman @ 2014-10-30  5:58 UTC (permalink / raw)
  To: linux-arm-kernel

From: Yoshifumi Hosoya <yoshifumi.hosoya.wj@renesas.com>

Signed-off-by: Yoshifumi Hosoya <yoshifumi.hosoya.wj@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7794.dtsi            | 14 +++++++++-----
 include/dt-bindings/clock/r8a7794-clock.h |  6 ++++++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index 08c50c8..d62589f 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -461,15 +461,19 @@
 		mstp1_clks: mstp1_clks at e6150134 {
 			compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
 			reg = <0 0xe6150134 0 4>, <0 0xe6150038 0 4>;
-			clocks = <&p_clk>, <&zg_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>,
-				 <&cp_clk>, <&zs_clk>, <&zs_clk>, <&zs_clk>;
+			clocks = <&zs_clk>, <&zs_clk>, <&p_clk>, <&zg_clk>, <&zs_clk>,
+				 <&zs_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>, <&cp_clk>,
+				 <&zs_clk>, <&zs_clk>;
 			#clock-cells = <1>;
 			renesas,clock-indices = <
-				R8A7794_CLK_TMU1 R8A7794_CLK_PVRSRVKM R8A7794_CLK_TMU3
-				R8A7794_CLK_TMU2 R8A7794_CLK_CMT0 R8A7794_CLK_TMU0
+				R8A7794_CLK_VCP0 R8A7794_CLK_VPC0 R8A7794_CLK_TMU1
+				R8A7794_CLK_PVRSRVKM R8A7794_CLK_2DDMAC R8A7794_CLK_FDP0
+				R8A7794_CLK_TMU3 R8A7794_CLK_TMU2 R8A7794_CLK_CMT0
+				R8A7794_CLK_TMU0 R8A7794_CLK_VSP1_DU0 R8A7794_CLK_VSP1_S
 			>;
 			clock-output-names =
-				"tmu1", "pvrsrvkm", "tmu3", "tmu2", "cmt0", "tmu0";
+				"vcp0", "vpc0", "tmu1", "pvrsrvkm", "tddmac", "fdp0",
+				"tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du0", "vsps";
 		};
 		mstp2_clks: mstp2_clks at e6150138 {
 			compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h
index 7d49531..512ce89 100644
--- a/include/dt-bindings/clock/r8a7794-clock.h
+++ b/include/dt-bindings/clock/r8a7794-clock.h
@@ -26,12 +26,18 @@
 #define R8A7794_CLK_MSIOF0		0
 
 /* MSTP1 */
+#define R8A7794_CLK_VCP0		1
+#define R8A7794_CLK_VPC0		3
 #define R8A7794_CLK_TMU1		11
 #define R8A7794_CLK_PVRSRVKM		12
+#define R8A7794_CLK_2DDMAC		15
+#define R8A7794_CLK_FDP0		19
 #define R8A7794_CLK_TMU3		21
 #define R8A7794_CLK_TMU2		22
 #define R8A7794_CLK_CMT0		24
 #define R8A7794_CLK_TMU0		25
+#define R8A7794_CLK_VSP1_DU0		28
+#define R8A7794_CLK_VSP1_S		31
 
 /* MSTP2 */
 #define R8A7794_CLK_SCIFA2		2
-- 
2.1.1

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

* [PATCH 1/3] ARM: shmobile: r8a7794: Add SGX clock to device tree
  2014-10-30  5:58 ` [PATCH 1/3] ARM: shmobile: r8a7794: Add SGX clock " Simon Horman
@ 2014-10-30  9:54   ` Geert Uytterhoeven
  2014-11-12  8:46     ` Simon Horman
  0 siblings, 1 reply; 8+ messages in thread
From: Geert Uytterhoeven @ 2014-10-30  9:54 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Oct 30, 2014 at 6:58 AM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> --- a/arch/arm/boot/dts/r8a7794.dtsi
> +++ b/arch/arm/boot/dts/r8a7794.dtsi
> @@ -461,16 +461,15 @@
>                 mstp1_clks: mstp1_clks at e6150134 {
>                         compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
>                         reg = <0 0xe6150134 0 4>, <0 0xe6150038 0 4>;
> -                       clocks = <&p_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>,
> -                                <&cp_clk>,
> -                                <&zs_clk>, <&zs_clk>, <&zs_clk>;
> +                       clocks = <&p_clk>, <&zg_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>,
> +                                <&cp_clk>, <&zs_clk>, <&zs_clk>, <&zs_clk>;
>                         #clock-cells = <1>;
>                         renesas,clock-indices = <
> -                               R8A7794_CLK_TMU1 R8A7794_CLK_TMU3 R8A7794_CLK_TMU2
> -                               R8A7794_CLK_CMT0 R8A7794_CLK_TMU0
> +                               R8A7794_CLK_TMU1 R8A7794_CLK_PVRSRVKM R8A7794_CLK_TMU3
> +                               R8A7794_CLK_TMU2 R8A7794_CLK_CMT0 R8A7794_CLK_TMU0
>                         >;
>                         clock-output-names =
> -                               "tmu1", "tmu3", "tmu2", "cmt0", "tmu0";
> +                               "tmu1", "pvrsrvkm", "tmu3", "tmu2", "cmt0", "tmu0";

"3dg"

> --- a/include/dt-bindings/clock/r8a7794-clock.h
> +++ b/include/dt-bindings/clock/r8a7794-clock.h
> @@ -27,6 +27,7 @@
>
>  /* MSTP1 */
>  #define R8A7794_CLK_TMU1               11
> +#define R8A7794_CLK_PVRSRVKM           12

R8A7794_CLK_3DG

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

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

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

* [PATCH 3/3] ARM: shmobile: r8a7794: Add MMP and VSP1 clocks to device tree
  2014-10-30  5:58 ` [PATCH 3/3] ARM: shmobile: r8a7794: Add MMP and VSP1 clocks " Simon Horman
@ 2014-10-30 10:01   ` Geert Uytterhoeven
  0 siblings, 0 replies; 8+ messages in thread
From: Geert Uytterhoeven @ 2014-10-30 10:01 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Oct 30, 2014 at 6:58 AM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> --- a/arch/arm/boot/dts/r8a7794.dtsi
> +++ b/arch/arm/boot/dts/r8a7794.dtsi
> @@ -461,15 +461,19 @@
>                 mstp1_clks: mstp1_clks at e6150134 {
>                         compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
>                         reg = <0 0xe6150134 0 4>, <0 0xe6150038 0 4>;
> -                       clocks = <&p_clk>, <&zg_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>,
> -                                <&cp_clk>, <&zs_clk>, <&zs_clk>, <&zs_clk>;
> +                       clocks = <&zs_clk>, <&zs_clk>, <&p_clk>, <&zg_clk>, <&zs_clk>,
> +                                <&zs_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>, <&cp_clk>,
> +                                <&zs_clk>, <&zs_clk>;
>                         #clock-cells = <1>;
>                         renesas,clock-indices = <
> -                               R8A7794_CLK_TMU1 R8A7794_CLK_PVRSRVKM R8A7794_CLK_TMU3
> -                               R8A7794_CLK_TMU2 R8A7794_CLK_CMT0 R8A7794_CLK_TMU0
> +                               R8A7794_CLK_VCP0 R8A7794_CLK_VPC0 R8A7794_CLK_TMU1
> +                               R8A7794_CLK_PVRSRVKM R8A7794_CLK_2DDMAC R8A7794_CLK_FDP0
> +                               R8A7794_CLK_TMU3 R8A7794_CLK_TMU2 R8A7794_CLK_CMT0
> +                               R8A7794_CLK_TMU0 R8A7794_CLK_VSP1_DU0 R8A7794_CLK_VSP1_S
>                         >;
>                         clock-output-names =
> -                               "tmu1", "pvrsrvkm", "tmu3", "tmu2", "cmt0", "tmu0";
> +                               "vcp0", "vpc0", "tmu1", "pvrsrvkm", "tddmac", "fdp0",

Please match the names with other R-Car Gen2 members:

"2ddmac", "fdp1-0"

> +                               "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du0", "vsps";

(Oops, r8a779[01] still have "vsp1-sy" here)

>                 };
>                 mstp2_clks: mstp2_clks at e6150138 {
>                         compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
> diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h
> index 7d49531..512ce89 100644
> --- a/include/dt-bindings/clock/r8a7794-clock.h
> +++ b/include/dt-bindings/clock/r8a7794-clock.h
> @@ -26,12 +26,18 @@
>  #define R8A7794_CLK_MSIOF0             0
>
>  /* MSTP1 */
> +#define R8A7794_CLK_VCP0               1
> +#define R8A7794_CLK_VPC0               3
>  #define R8A7794_CLK_TMU1               11
>  #define R8A7794_CLK_PVRSRVKM           12
> +#define R8A7794_CLK_2DDMAC             15
> +#define R8A7794_CLK_FDP0               19

R8A7794_CLK_FDP1_0

>  #define R8A7794_CLK_TMU3               21
>  #define R8A7794_CLK_TMU2               22
>  #define R8A7794_CLK_CMT0               24
>  #define R8A7794_CLK_TMU0               25
> +#define R8A7794_CLK_VSP1_DU0           28
> +#define R8A7794_CLK_VSP1_S             31






-- 
Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

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

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

* [PATCH 2/3] ARM: shmobile: r8a7794: Add VIN clock to device tree
  2014-10-30  5:58 ` [PATCH 2/3] ARM: shmobile: r8a7794: Add VIN " Simon Horman
@ 2014-11-04  0:10   ` Simon Horman
  0 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2014-11-04  0:10 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Oct 30, 2014 at 02:58:55PM +0900, Simon Horman wrote:
> From: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
> 
> Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
>  arch/arm/boot/dts/r8a7794.dtsi            | 6 +++---
>  include/dt-bindings/clock/r8a7794-clock.h | 2 ++
>  2 files changed, 5 insertions(+), 3 deletions(-)

I have queued up this patch (but not the other twi in the series).

> 
> diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
> index d348dee..08c50c8 100644
> --- a/arch/arm/boot/dts/r8a7794.dtsi
> +++ b/arch/arm/boot/dts/r8a7794.dtsi
> @@ -516,13 +516,13 @@
>  		mstp8_clks: mstp8_clks at e6150990 {
>  			compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
>  			reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>;
> -			clocks = <&p_clk>;
> +			clocks = <&zg_clk>, <&zg_clk>, <&p_clk>;
>  			#clock-cells = <1>;
>  			renesas,clock-indices = <
> -				R8A7794_CLK_ETHER
> +				R8A7794_CLK_VIN1 R8A7794_CLK_VIN0 R8A7794_CLK_ETHER
>  			>;
>  			clock-output-names =
> -				"ether";
> +				"vin1", "vin0", "ether";
>  		};
>  		mstp11_clks: mstp11_clks at e615099c {
>  			compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
> diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h
> index 29a6789..7d49531 100644
> --- a/include/dt-bindings/clock/r8a7794-clock.h
> +++ b/include/dt-bindings/clock/r8a7794-clock.h
> @@ -62,6 +62,8 @@
>  #define R8A7794_CLK_SCIF0		21
>  
>  /* MSTP8 */
> +#define R8A7794_CLK_VIN1		10
> +#define R8A7794_CLK_VIN0		11
>  #define R8A7794_CLK_ETHER		13
>  
>  /* MSTP9 */
> -- 
> 2.1.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

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

* [PATCH 1/3] ARM: shmobile: r8a7794: Add SGX clock to device tree
  2014-10-30  9:54   ` Geert Uytterhoeven
@ 2014-11-12  8:46     ` Simon Horman
  0 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2014-11-12  8:46 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Oct 30, 2014 at 10:54:04AM +0100, Geert Uytterhoeven wrote:
> On Thu, Oct 30, 2014 at 6:58 AM, Simon Horman
> <horms+renesas@verge.net.au> wrote:
> > --- a/arch/arm/boot/dts/r8a7794.dtsi
> > +++ b/arch/arm/boot/dts/r8a7794.dtsi
> > @@ -461,16 +461,15 @@
> >                 mstp1_clks: mstp1_clks at e6150134 {
> >                         compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
> >                         reg = <0 0xe6150134 0 4>, <0 0xe6150038 0 4>;
> > -                       clocks = <&p_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>,
> > -                                <&cp_clk>,
> > -                                <&zs_clk>, <&zs_clk>, <&zs_clk>;
> > +                       clocks = <&p_clk>, <&zg_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>,
> > +                                <&cp_clk>, <&zs_clk>, <&zs_clk>, <&zs_clk>;
> >                         #clock-cells = <1>;
> >                         renesas,clock-indices = <
> > -                               R8A7794_CLK_TMU1 R8A7794_CLK_TMU3 R8A7794_CLK_TMU2
> > -                               R8A7794_CLK_CMT0 R8A7794_CLK_TMU0
> > +                               R8A7794_CLK_TMU1 R8A7794_CLK_PVRSRVKM R8A7794_CLK_TMU3
> > +                               R8A7794_CLK_TMU2 R8A7794_CLK_CMT0 R8A7794_CLK_TMU0
> >                         >;
> >                         clock-output-names =
> > -                               "tmu1", "tmu3", "tmu2", "cmt0", "tmu0";
> > +                               "tmu1", "pvrsrvkm", "tmu3", "tmu2", "cmt0", "tmu0";
> 
> "3dg"
> 
> > --- a/include/dt-bindings/clock/r8a7794-clock.h
> > +++ b/include/dt-bindings/clock/r8a7794-clock.h
> > @@ -27,6 +27,7 @@
> >
> >  /* MSTP1 */
> >  #define R8A7794_CLK_TMU1               11
> > +#define R8A7794_CLK_PVRSRVKM           12
> 
> R8A7794_CLK_3DG

Thanks, I will fix that.
Sorry for missing it the first time around.

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

end of thread, other threads:[~2014-11-12  8:46 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-30  5:58 [PATCH 0/3] ARM: shmobile: r8a7794: Add VIN, SGX, MMP and VSP1 to device tree Simon Horman
2014-10-30  5:58 ` [PATCH 1/3] ARM: shmobile: r8a7794: Add SGX clock " Simon Horman
2014-10-30  9:54   ` Geert Uytterhoeven
2014-11-12  8:46     ` Simon Horman
2014-10-30  5:58 ` [PATCH 2/3] ARM: shmobile: r8a7794: Add VIN " Simon Horman
2014-11-04  0:10   ` Simon Horman
2014-10-30  5:58 ` [PATCH 3/3] ARM: shmobile: r8a7794: Add MMP and VSP1 clocks " Simon Horman
2014-10-30 10:01   ` Geert Uytterhoeven

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