Re: [PATCH 2/2] arm64: dts: r8a7795: salvator-x: Unify DU node between ES1.x and ES2.0

[Laurent Pinchart]

Hi Geert,

On Friday 16 Jun 2017 09:37:12 Geert Uytterhoeven wrote:
> On Thu, Jun 15, 2017 at 9:37 AM, Laurent Pinchart wrote:
> > The external clocks used by the DU are identical on the H3 ES1.x and
> > ES2.0 SoCs. There is thus no need to duplicate DU clocks in both
> > r8a7795-salvator-x.dts and r8a7795-es1-salvator-x.dts, move them all to
> > salvator-x.dtsi.
> 
> Unfortunately the external clock wiring is different on R-Car M3-W.
> As salvator-x.dtsi/salvator-common.dtsi is also used for M3-W-based boards,
> I'm afraid the external clock description has to be duplicated for R-Car H3
> ES1.x and ES2.0.
> 
> Unless we introduce e.g. r8a7795-salvator-x-common.dtsi, but that may be
> overkill?

You're right, my bad. I'll drop this patch.

-- 
Regards,

Laurent Pinchart

Re: [PATCH 2/2] arm64: dts: r8a7795: salvator-x: Unify DU node between ES1.x and ES2.0

[Geert Uytterhoeven]

Hi Laurent,

On Thu, Jun 15, 2017 at 9:37 AM, Laurent Pinchart
 wrote:
> The external clocks used by the DU are identical on the H3 ES1.x and
> ES2.0 SoCs. There is thus no need to duplicate DU clocks in both
> r8a7795-salvator-x.dts and r8a7795-es1-salvator-x.dts, move them all to
> salvator-x.dtsi.

Unfortunately the external clock wiring is different on R-Car M3-W.
As salvator-x.dtsi/salvator-common.dtsi is also used for M3-W-based boards,
I'm afraid the external clock description has to be duplicated for R-Car H3
ES1.x and ES2.0.

Unless we introduce e.g. r8a7795-salvator-x-common.dtsi, but that may be
overkill?

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@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

[PATCH 2/2] arm64: dts: r8a7795: salvator-x: Unify DU node between ES1.x and ES2.0

[Laurent Pinchart]

The external clocks used by the DU are identical on the H3 ES1.x and
ES2.0 SoCs. There is thus no need to duplicate DU clocks in both
r8a7795-salvator-x.dts and r8a7795-es1-salvator-x.dts, move them all to
salvator-x.dtsi.

Signed-off-by: Laurent Pinchart 
---
 arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts | 14 --
 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 14 --
 arch/arm64/boot/dts/renesas/salvator-x.dtsi| 12 
 3 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts 
b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
index 1bb1dd61ba1c..755c5c6845b9 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
@@ -40,20 +40,6 @@
};
 };
 
- {
-   clocks = < CPG_MOD 724>,
-< CPG_MOD 723>,
-< CPG_MOD 722>,
-< CPG_MOD 721>,
-< CPG_MOD 727>,
-< 1>,
-<_clk>,
-<_clk>,
-< 2>;
-   clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0",
- "dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3";
-};
-
  {
status = "okay";
 };
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts 
b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
index 8bcf4c0d6c4a..0322e23b0a18 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
@@ -40,20 +40,6 @@
};
 };
 
- {
-   clocks = < CPG_MOD 724>,
-< CPG_MOD 723>,
-< CPG_MOD 722>,
-< CPG_MOD 721>,
-< CPG_MOD 727>,
-< 1>,
-<_clk>,
-<_clk>,
-< 2>;
-   clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0",
- "dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3";
-};
-
  {
status = "okay";
 };
diff --git a/arch/arm64/boot/dts/renesas/salvator-x.dtsi 
b/arch/arm64/boot/dts/renesas/salvator-x.dtsi
index 1f6b9fbb13af..d51d4f60a822 100644
--- a/arch/arm64/boot/dts/renesas/salvator-x.dtsi
+++ b/arch/arm64/boot/dts/renesas/salvator-x.dtsi
@@ -265,6 +265,18 @@
pinctrl-names = "default";
status = "okay";
 
+   clocks = < CPG_MOD 724>,
+< CPG_MOD 723>,
+< CPG_MOD 722>,
+< CPG_MOD 721>,
+< CPG_MOD 727>,
+< 1>,
+<_clk>,
+<_clk>,
+< 2>;
+   clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0",
+ "dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3";
+
ports {
port@0 {
endpoint {
-- 
Regards,

Laurent Pinchart