diff mbox

[3/4] ARM: shmobile: r8a7790: Add MMP clock to device tree

Message ID 1412848985-29353-4-git-send-email-ykaneko0929@gmail.com (mailing list archive)
State Superseded
Headers show

Commit Message

Yoshihiro Kaneko Oct. 9, 2014, 10:03 a.m. UTC 
From: Yoshifumi Hosoya <yoshifumi.hosoya.wj@renesas.com>

Signed-off-by: Yoshifumi Hosoya <yoshifumi.hosoya.wj@renesas.com>
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
---
 arch/arm/boot/dts/r8a7790.dtsi            | 22 ++++++++++++++--------
 include/dt-bindings/clock/r8a7790-clock.h | 11 ++++++++++-
 2 files changed, 24 insertions(+), 9 deletions(-)

Comments

Geert Uytterhoeven Oct. 9, 2014, 12:29 p.m. UTC | #1 
Hi Kaneko-san, Hosoya-san,

On Thu, Oct 9, 2014 at 12:03 PM, Yoshihiro Kaneko <ykaneko0929@gmail.com> wrote:
> From: Yoshifumi Hosoya <yoshifumi.hosoya.wj@renesas.com>

Thanks for your patches!

> Signed-off-by: Yoshifumi Hosoya <yoshifumi.hosoya.wj@renesas.com>
> Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
> ---
>  arch/arm/boot/dts/r8a7790.dtsi            | 22 ++++++++++++++--------
>  include/dt-bindings/clock/r8a7790-clock.h | 11 ++++++++++-
>  2 files changed, 24 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
> index 27c038c..244a838 100644
> --- a/arch/arm/boot/dts/r8a7790.dtsi
> +++ b/arch/arm/boot/dts/r8a7790.dtsi

>                         clock-output-names =
> -                               "jpu", "tmu1", "pvrsrvkm", "tmu3", "tmu2", "cmt0", "tmu0",
> +                               "vcp1", "vcp0", "vpc1", "vpc0", "jpu", "ssp1",
> +                               "tmu1", "pvrsrvkm", "2ddmac", "fdp2", "fdp1",
> +                               "fdp0", "tmu3", "tmu2", "cmt0", "tmu0",

The datasheet calls these clocks "fdp1-2", "fdp1-1", and "fdp1-0", instead
of "fdp2", "fdp1", and "fdp0".

> --- a/include/dt-bindings/clock/r8a7790-clock.h
> +++ b/include/dt-bindings/clock/r8a7790-clock.h

> +#define R8A7790_CLK_2DDMAC             15
> +#define R8A7790_CLK_FDP2               17
> +#define R8A7790_CLK_FDP1               18
> +#define R8A7790_CLK_FDP0               19
>  #define R8A7790_CLK_TMU3               21
>  #define R8A7790_CLK_TMU2               22
>  #define R8A7790_CLK_CMT0               24

Likewise.

My comments also apply to the corresponding patch for r8a7791.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@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
--
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
Simon Horman Oct. 10, 2014, 1:24 a.m. UTC | #2 
On Thu, Oct 09, 2014 at 02:29:53PM +0200, Geert Uytterhoeven wrote:
> Hi Kaneko-san, Hosoya-san,
> 
> On Thu, Oct 9, 2014 at 12:03 PM, Yoshihiro Kaneko <ykaneko0929@gmail.com> wrote:
> > From: Yoshifumi Hosoya <yoshifumi.hosoya.wj@renesas.com>
> 
> Thanks for your patches!
> 
> > Signed-off-by: Yoshifumi Hosoya <yoshifumi.hosoya.wj@renesas.com>
> > Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
> > ---
> >  arch/arm/boot/dts/r8a7790.dtsi            | 22 ++++++++++++++--------
> >  include/dt-bindings/clock/r8a7790-clock.h | 11 ++++++++++-
> >  2 files changed, 24 insertions(+), 9 deletions(-)
> >
> > diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
> > index 27c038c..244a838 100644
> > --- a/arch/arm/boot/dts/r8a7790.dtsi
> > +++ b/arch/arm/boot/dts/r8a7790.dtsi
> 
> >                         clock-output-names =
> > -                               "jpu", "tmu1", "pvrsrvkm", "tmu3", "tmu2", "cmt0", "tmu0",
> > +                               "vcp1", "vcp0", "vpc1", "vpc0", "jpu", "ssp1",
> > +                               "tmu1", "pvrsrvkm", "2ddmac", "fdp2", "fdp1",
> > +                               "fdp0", "tmu3", "tmu2", "cmt0", "tmu0",
> 
> The datasheet calls these clocks "fdp1-2", "fdp1-1", and "fdp1-0", instead
> of "fdp2", "fdp1", and "fdp0".

Thanks.

Kaneko-san, can you update the patches accordingly?

> > --- a/include/dt-bindings/clock/r8a7790-clock.h
> > +++ b/include/dt-bindings/clock/r8a7790-clock.h
> 
> > +#define R8A7790_CLK_2DDMAC             15
> > +#define R8A7790_CLK_FDP2               17
> > +#define R8A7790_CLK_FDP1               18
> > +#define R8A7790_CLK_FDP0               19
> >  #define R8A7790_CLK_TMU3               21
> >  #define R8A7790_CLK_TMU2               22
> >  #define R8A7790_CLK_CMT0               24
> 
> Likewise.
> 
> My comments also apply to the corresponding patch for r8a7791.
> 
> Gr{oetje,eeting}s,
> 
>                         Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@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
> 
--
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
Yoshihiro Kaneko Oct. 10, 2014, 2:46 a.m. UTC | #3 
2014-10-10 10:24 GMT+09:00 Simon Horman <horms@verge.net.au>:
> On Thu, Oct 09, 2014 at 02:29:53PM +0200, Geert Uytterhoeven wrote:
>> Hi Kaneko-san, Hosoya-san,
>>
>> On Thu, Oct 9, 2014 at 12:03 PM, Yoshihiro Kaneko <ykaneko0929@gmail.com> wrote:
>> > From: Yoshifumi Hosoya <yoshifumi.hosoya.wj@renesas.com>
>>
>> Thanks for your patches!
>>
>> > Signed-off-by: Yoshifumi Hosoya <yoshifumi.hosoya.wj@renesas.com>
>> > Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
>> > ---
>> >  arch/arm/boot/dts/r8a7790.dtsi            | 22 ++++++++++++++--------
>> >  include/dt-bindings/clock/r8a7790-clock.h | 11 ++++++++++-
>> >  2 files changed, 24 insertions(+), 9 deletions(-)
>> >
>> > diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
>> > index 27c038c..244a838 100644
>> > --- a/arch/arm/boot/dts/r8a7790.dtsi
>> > +++ b/arch/arm/boot/dts/r8a7790.dtsi
>>
>> >                         clock-output-names =
>> > -                               "jpu", "tmu1", "pvrsrvkm", "tmu3", "tmu2", "cmt0", "tmu0",
>> > +                               "vcp1", "vcp0", "vpc1", "vpc0", "jpu", "ssp1",
>> > +                               "tmu1", "pvrsrvkm", "2ddmac", "fdp2", "fdp1",
>> > +                               "fdp0", "tmu3", "tmu2", "cmt0", "tmu0",
>>
>> The datasheet calls these clocks "fdp1-2", "fdp1-1", and "fdp1-0", instead
>> of "fdp2", "fdp1", and "fdp0".
>
> Thanks.
>
> Kaneko-san, can you update the patches accordingly?

Sure, I will do it.

>
>> > --- a/include/dt-bindings/clock/r8a7790-clock.h
>> > +++ b/include/dt-bindings/clock/r8a7790-clock.h
>>
>> > +#define R8A7790_CLK_2DDMAC             15
>> > +#define R8A7790_CLK_FDP2               17
>> > +#define R8A7790_CLK_FDP1               18
>> > +#define R8A7790_CLK_FDP0               19
>> >  #define R8A7790_CLK_TMU3               21
>> >  #define R8A7790_CLK_TMU2               22
>> >  #define R8A7790_CLK_CMT0               24
>>
>> Likewise.
>>
>> My comments also apply to the corresponding patch for r8a7791.
>>
>> Gr{oetje,eeting}s,
>>
>>                         Geert
>>
>> --
>> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@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
>>
--
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
diff mbox

Patch

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 27c038c..244a838 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -938,18 +938,24 @@ 
 		mstp1_clks: mstp1_clks@e6150134 {
 			compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
 			reg = <0 0xe6150134 0 4>, <0 0xe6150038 0 4>;
-			clocks = <&m2_clk>, <&p_clk>, <&zg_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>,
-				 <&cp_clk>, <&zs_clk>, <&zs_clk>, <&zs_clk>,
-				 <&zs_clk>;
+			clocks = <&zs_clk>, <&zs_clk>, <&zs_clk>, <&zs_clk>, <&m2_clk>,
+				 <&zs_clk>, <&p_clk>, <&zg_clk>, <&zs_clk>, <&zs_clk>,
+				 <&zs_clk>, <&zs_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>,
+				 <&cp_clk>, <&zs_clk>, <&zs_clk>, <&zs_clk>, <&zs_clk>;
 			#clock-cells = <1>;
 			renesas,clock-indices = <
-				R8A7790_CLK_JPU R8A7790_CLK_TMU1 R8A7790_CLK_PVRSRVKM
-				R8A7790_CLK_TMU3 R8A7790_CLK_TMU2
-				R8A7790_CLK_CMT0 R8A7790_CLK_TMU0 R8A7790_CLK_VSP1_DU1
-				R8A7790_CLK_VSP1_DU0 R8A7790_CLK_VSP1_R R8A7790_CLK_VSP1_S
+				R8A7790_CLK_VCP1 R8A7790_CLK_VCP0 R8A7790_CLK_VPC1
+				R8A7790_CLK_VPC0 R8A7790_CLK_JPU R8A7790_CLK_SSP1
+				R8A7790_CLK_TMU1 R8A7790_CLK_PVRSRVKM R8A7790_CLK_2DDMAC
+				R8A7790_CLK_FDP2 R8A7790_CLK_FDP1 R8A7790_CLK_FDP0
+				R8A7790_CLK_TMU3 R8A7790_CLK_TMU2 R8A7790_CLK_CMT0
+				R8A7790_CLK_TMU0 R8A7790_CLK_VSP1_DU1 R8A7790_CLK_VSP1_DU0
+				R8A7790_CLK_VSP1_R R8A7790_CLK_VSP1_S
 			>;
 			clock-output-names =
-				"jpu", "tmu1", "pvrsrvkm", "tmu3", "tmu2", "cmt0", "tmu0",
+				"vcp1", "vcp0", "vpc1", "vpc0", "jpu", "ssp1",
+				"tmu1", "pvrsrvkm", "2ddmac", "fdp2", "fdp1",
+				"fdp0", "tmu3", "tmu2", "cmt0", "tmu0",
 				"vsp1-du1", "vsp1-du0", "vsp1-rt", "vsp1-sy";
 		};
 		mstp2_clks: mstp2_clks@e6150138 {
diff --git a/include/dt-bindings/clock/r8a7790-clock.h b/include/dt-bindings/clock/r8a7790-clock.h
index 2d2f668..15ea834 100644
--- a/include/dt-bindings/clock/r8a7790-clock.h
+++ b/include/dt-bindings/clock/r8a7790-clock.h
@@ -26,9 +26,18 @@ 
 #define R8A7790_CLK_MSIOF0		0
 
 /* MSTP1 */
-#define R8A7790_CLK_JPU		6
+#define R8A7790_CLK_VCP1		0
+#define R8A7790_CLK_VCP0		1
+#define R8A7790_CLK_VPC1		2
+#define R8A7790_CLK_VPC0		3
+#define R8A7790_CLK_JPU			6
+#define R8A7790_CLK_SSP1		9
 #define R8A7790_CLK_TMU1		11
 #define R8A7790_CLK_PVRSRVKM		12
+#define R8A7790_CLK_2DDMAC		15
+#define R8A7790_CLK_FDP2		17
+#define R8A7790_CLK_FDP1		18
+#define R8A7790_CLK_FDP0		19
 #define R8A7790_CLK_TMU3		21
 #define R8A7790_CLK_TMU2		22
 #define R8A7790_CLK_CMT0		24