diff mbox

[v2] arm64: dts: r8a7795: salvator-x: Add DU0 and DU3 external dot clocks

Message ID 20170112015121.2860-1-laurent.pinchart+renesas@ideasonboard.com (mailing list archive)
State Superseded
Delegated to: Simon Horman
Headers show

Commit Message

Laurent Pinchart Jan. 12, 2017, 1:51 a.m. UTC
The clocks are generated by an I2C-controlled programmable clock
generator.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 26 ++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

This patch depends on the clk-versaclock5 driver posted by Marek.

Changes since v1:

- Dropped the assigned-clocks properties

Comments

Marek Vasut Jan. 12, 2017, 1:56 a.m. UTC | #1
On 01/12/2017 02:51 AM, Laurent Pinchart wrote:
> The clocks are generated by an I2C-controlled programmable clock
> generator.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

Reviewed-by: Marek Vasut <marek.vasut@gmail.com>

> ---
>  arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 26 ++++++++++++++++++++--
>  1 file changed, 24 insertions(+), 2 deletions(-)
> 
> This patch depends on the clk-versaclock5 driver posted by Marek.
> 
> Changes since v1:
> 
> - Dropped the assigned-clocks properties
> 
> diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
> index 2dc0887fc400..5a13ddc5b497 100644
> --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
> +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
> @@ -178,6 +178,12 @@
>  		clock-frequency = <33000000>;
>  	};
>  
> +	x23_clk: x23-clock {
> +		compatible = "fixed-clock";
> +		#clock-cells = <0>;
> +		clock-frequency = <25000000>;
> +	};
> +
>  	hdmi0-out {
>  		compatible = "hdmi-connector";
>  		label = "HDMI0 OUT";
> @@ -271,10 +277,12 @@
>  		 <&cpg CPG_MOD 722>,
>  		 <&cpg CPG_MOD 721>,
>  		 <&cpg CPG_MOD 727>,
> +		 <&versaclock5 1>,
>  		 <&x21_clk>,
> -		 <&x22_clk>;
> +		 <&x22_clk>,
> +		 <&versaclock5 2>;
>  	clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0",
> -		      "dclkin.1", "dclkin.2";
> +		      "dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3";
>  
>  	ports {
>  		port@0 {
> @@ -460,6 +468,20 @@
>  	};
>  };
>  
> +&i2c4 {
> +	status = "okay";
> +
> +	clock-frequency = <100000>;
> +
> +	versaclock5: clock-generator@6a {
> +		compatible = "idt,5p49v5923";
> +		reg = <0x6a>;
> +		#clock-cells = <1>;
> +		clocks = <&x23_clk>;
> +		clock-names = "xin";
> +	};
> +};
> +
>  &rcar_sound {
>  	pinctrl-0 = <&sound_pins &sound_clk_pins>;
>  	pinctrl-names = "default";
>
Geert Uytterhoeven Jan. 12, 2017, 8:36 a.m. UTC | #2
On Thu, Jan 12, 2017 at 2:51 AM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:
> The clocks are generated by an I2C-controlled programmable clock
> generator.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

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
Simon Horman Jan. 12, 2017, 9:04 a.m. UTC | #3
On Thu, Jan 12, 2017 at 03:51:21AM +0200, Laurent Pinchart wrote:
> The clocks are generated by an I2C-controlled programmable clock
> generator.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
>  arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 26 ++++++++++++++++++++--
>  1 file changed, 24 insertions(+), 2 deletions(-)
> 
> This patch depends on the clk-versaclock5 driver posted by Marek.

Can the patch be safely applied without the above driver present?

FWIW, this patch does not seem to apply cleanly on
renesas-next-20170110-v4.10-rc2.
Laurent Pinchart Jan. 12, 2017, 9:23 a.m. UTC | #4
Hi Simon,

On Thursday 12 Jan 2017 10:04:34 Simon Horman wrote:
> On Thu, Jan 12, 2017 at 03:51:21AM +0200, Laurent Pinchart wrote:
> > The clocks are generated by an I2C-controlled programmable clock
> > generator.
> > 
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
> > ---
> > 
> >  arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 26 +++++++++++++++--
> >  1 file changed, 24 insertions(+), 2 deletions(-)
> > 
> > This patch depends on the clk-versaclock5 driver posted by Marek.
> 
> Can the patch be safely applied without the above driver present?

It will result in DU probing being deferred forever, so I'd say no :-)

> FWIW, this patch does not seem to apply cleanly on
> renesas-next-20170110-v4.10-rc2.

I'll fix the conflicts and resubmit when the driver lands.
Simon Horman Jan. 12, 2017, 9:41 a.m. UTC | #5
On Thu, Jan 12, 2017 at 11:23:57AM +0200, Laurent Pinchart wrote:
> Hi Simon,
> 
> On Thursday 12 Jan 2017 10:04:34 Simon Horman wrote:
> > On Thu, Jan 12, 2017 at 03:51:21AM +0200, Laurent Pinchart wrote:
> > > The clocks are generated by an I2C-controlled programmable clock
> > > generator.
> > > 
> > > Signed-off-by: Laurent Pinchart
> > > <laurent.pinchart+renesas@ideasonboard.com>
> > > ---
> > > 
> > >  arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 26 +++++++++++++++--
> > >  1 file changed, 24 insertions(+), 2 deletions(-)
> > > 
> > > This patch depends on the clk-versaclock5 driver posted by Marek.
> > 
> > Can the patch be safely applied without the above driver present?
> 
> It will result in DU probing being deferred forever, so I'd say no :-)

Agreed.

> > FWIW, this patch does not seem to apply cleanly on
> > renesas-next-20170110-v4.10-rc2.
> 
> I'll fix the conflicts and resubmit when the driver lands.

Thanks.
diff mbox

Patch

diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
index 2dc0887fc400..5a13ddc5b497 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
@@ -178,6 +178,12 @@ 
 		clock-frequency = <33000000>;
 	};
 
+	x23_clk: x23-clock {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <25000000>;
+	};
+
 	hdmi0-out {
 		compatible = "hdmi-connector";
 		label = "HDMI0 OUT";
@@ -271,10 +277,12 @@ 
 		 <&cpg CPG_MOD 722>,
 		 <&cpg CPG_MOD 721>,
 		 <&cpg CPG_MOD 727>,
+		 <&versaclock5 1>,
 		 <&x21_clk>,
-		 <&x22_clk>;
+		 <&x22_clk>,
+		 <&versaclock5 2>;
 	clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0",
-		      "dclkin.1", "dclkin.2";
+		      "dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3";
 
 	ports {
 		port@0 {
@@ -460,6 +468,20 @@ 
 	};
 };
 
+&i2c4 {
+	status = "okay";
+
+	clock-frequency = <100000>;
+
+	versaclock5: clock-generator@6a {
+		compatible = "idt,5p49v5923";
+		reg = <0x6a>;
+		#clock-cells = <1>;
+		clocks = <&x23_clk>;
+		clock-names = "xin";
+	};
+};
+
 &rcar_sound {
 	pinctrl-0 = <&sound_pins &sound_clk_pins>;
 	pinctrl-names = "default";