Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1662342 > unrolled thread

[PATCH 0/4] arm64: renesas: Add support for Salvator-XS

Started byGeert Uytterhoeven <geert+renesas@glider.be>
First post2017-06-09 13:50 +0200
Last post2017-06-12 11:20 +0200
Articles 6 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH 0/4] arm64: renesas: Add support for Salvator-XS Geert Uytterhoeven <geert+renesas@glider.be> - 2017-06-09 13:50 +0200
    [PATCH 4/4] arm64: dts: renesas: Add support for Salvator-XS with R-Car H3 ES2.0 Geert Uytterhoeven <geert+renesas@glider.be> - 2017-06-09 13:50 +0200
    [PATCH 3/4] arm64: dts: renesas: Add common Salvator-XS board support Geert Uytterhoeven <geert+renesas@glider.be> - 2017-06-09 13:50 +0200
    [PATCH 1/4] ARM: shmobile: Document Renesas H3-based Salvator-XS board DT bindings Geert Uytterhoeven <geert+renesas@glider.be> - 2017-06-09 13:50 +0200
      Re: [PATCH 1/4] ARM: shmobile: Document Renesas H3-based Salvator-XS  board DT bindings Rob Herring <robh@kernel.org> - 2017-06-18 16:10 +0200
    Re: [PATCH 0/4] arm64: renesas: Add support for Salvator-XS Simon Horman <horms@verge.net.au> - 2017-06-12 11:20 +0200

#1662342 — [PATCH 0/4] arm64: renesas: Add support for Salvator-XS

FromGeert Uytterhoeven <geert+renesas@glider.be>
Date2017-06-09 13:50 +0200
Subject[PATCH 0/4] arm64: renesas: Add support for Salvator-XS
Message-ID<tQqAq-Yw-25@gated-at.bofh.it>
	Hi Simon, Magnus,

The Renesas Salvator-XS (Salvator-X 2nd version) development board can
be equipped with either an R-Car H3 ES2.0 or M3-W ES1.x SiP, which are
pin-compatible.

This patch series adds initial support for the Renesas Salvator-XS
development board equipped with an R-Car H3 ES2.0 SiP.  The support
level is similar to the existing support for Salvator-X with the same
SiP.  See below for exceptions.

The Salvator-XS board is similar but not identical to the already
supported Salvator-X board.  To avoid duplication, the common parts are
extracted first into its own .dtsi file.
Noteworthy differences are:
  - The main clock crystal ticks at a slightly different rate.
  - On R-Car H3 ES2.0, SATA no longer uses dedicated pins, but shares
    them with the second PCIe channel.  To cater for this, a MAX4888B
    multiplexer has been added to Salvator-XS.  As the default hardware
    configuration enables PCIe, I disabled SATA.
  - The Versaclock5 clock generator has been replaced by a similar
    member of the Versaclock6 family.  As the latter is not supported by
    Linux yet, I left it out.
  - The USB3.0 micro-B connector is replaced by a USB2.0 micro-AB
    connector (both are not yet supported, so no change is needed now).

Dependencies:
  - renesas-devel-20170608-v4.12-rc4,
  - "arm64: dts: salvator-x: Add missing index to PWM pinctrl subnode
    name".

For your convenience, I've pushed this series, its dependencies, and a
few related driver changes to the topic/r8a7795-salvator-xs branch of
the git repository at
https://git.kernel.org/cgit/linux/kernel/git/geert/renesas-drivers.git

This has been tested on Salvator-XS with R-Car H3 ES2.0, and Salvator-X
with R-Car H3 ES1.0.

Thanks!

Geert Uytterhoeven (4):
  ARM: shmobile: Document Renesas H3-based Salvator-XS board DT bindings
  arm64: dts: renesas: Extract common Salvator-X/XS board support
  arm64: dts: renesas: Add common Salvator-XS board support
  arm64: dts: renesas: Add support for Salvator-XS with R-Car H3 ES2.0

 Documentation/devicetree/bindings/arm/shmobile.txt |   2 +
 arch/arm64/boot/dts/renesas/Makefile               |   1 +
 .../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 109 ++++
 .../{salvator-x.dtsi => salvator-common.dtsi}      |  17 +-
 arch/arm64/boot/dts/renesas/salvator-x.dtsi        | 616 +--------------------
 arch/arm64/boot/dts/renesas/salvator-xs.dtsi       |  20 +
 6 files changed, 134 insertions(+), 631 deletions(-)
 create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
 copy arch/arm64/boot/dts/renesas/{salvator-x.dtsi => salvator-common.dtsi} (97%)
 create mode 100644 arch/arm64/boot/dts/renesas/salvator-xs.dtsi

-- 
2.7.4

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

[toc] | [next] | [standalone]

#1662344 — [PATCH 4/4] arm64: dts: renesas: Add support for Salvator-XS with R-Car H3 ES2.0

FromGeert Uytterhoeven <geert+renesas@glider.be>
Date2017-06-09 13:50 +0200
Subject[PATCH 4/4] arm64: dts: renesas: Add support for Salvator-XS with R-Car H3 ES2.0
Message-ID<tQqAr-Yw-37@gated-at.bofh.it>
In reply to#1662342
Add initial support for the Renesas Salvator-XS (Salvator-X 2nd version)
development board equipped with an R-Car H3 ES2.0 SiP.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm64/boot/dts/renesas/Makefile               |   1 +
 .../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 109 +++++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts

diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile
index d5451015950e3dfc..acc4bb30d485b6bc 100644
--- a/arch/arm64/boot/dts/renesas/Makefile
+++ b/arch/arm64/boot/dts/renesas/Makefile
@@ -1,4 +1,5 @@
 dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-x.dtb r8a7795-h3ulcb.dtb
+dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-xs.dtb
 dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-salvator-x.dtb r8a7795-es1-h3ulcb.dtb
 dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb
 
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
new file mode 100644
index 0000000000000000..de354957144b4822
--- /dev/null
+++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
@@ -0,0 +1,109 @@
+/*
+ * Device Tree Source for the Salvator-X 2nd version board
+ *
+ * Copyright (C) 2015-2017 Renesas Electronics Corp.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#define CPG_AUDIO_CLK_I		R8A7795_CLK_S0D4
+
+/dts-v1/;
+#include "r8a7795.dtsi"
+#include "salvator-xs.dtsi"
+
+/ {
+	model = "Renesas Salvator-X 2nd version board based on r8a7795 ES2.0+";
+	compatible = "renesas,salvator-xs", "renesas,r8a7795";
+
+	memory@48000000 {
+		device_type = "memory";
+		/* first 128MB is reserved for secure area. */
+		reg = <0x0 0x48000000 0x0 0x38000000>;
+	};
+
+	memory@500000000 {
+		device_type = "memory";
+		reg = <0x5 0x00000000 0x0 0x40000000>;
+	};
+
+	memory@600000000 {
+		device_type = "memory";
+		reg = <0x6 0x00000000 0x0 0x40000000>;
+	};
+
+	memory@700000000 {
+		device_type = "memory";
+		reg = <0x7 0x00000000 0x0 0x40000000>;
+	};
+};
+
+&du {
+	clocks = <&cpg CPG_MOD 724>,
+		 <&cpg CPG_MOD 723>,
+		 <&cpg CPG_MOD 722>,
+		 <&cpg CPG_MOD 721>,
+		 <&cpg CPG_MOD 727>,
+		 <&x21_clk>,
+		 <&x22_clk>;
+	clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0",
+		      "dclkin.1", "dclkin.2";
+};
+
+&ehci2 {
+	status = "okay";
+};
+
+&hdmi0 {
+	status = "okay";
+
+	ports {
+		port@1 {
+			reg = <1>;
+			rcar_dw_hdmi0_out: endpoint {
+				remote-endpoint = <&hdmi0_con>;
+			};
+		};
+	};
+};
+
+&hdmi0_con {
+	remote-endpoint = <&rcar_dw_hdmi0_out>;
+};
+
+&hdmi1 {
+	status = "okay";
+
+	ports {
+		port@1 {
+			reg = <1>;
+			rcar_dw_hdmi1_out: endpoint {
+				remote-endpoint = <&hdmi1_con>;
+			};
+		};
+	};
+};
+
+&hdmi1_con {
+	remote-endpoint = <&rcar_dw_hdmi1_out>;
+};
+
+&ohci2 {
+	status = "okay";
+};
+
+&pfc {
+	usb2_pins: usb2 {
+		groups = "usb2";
+		function = "usb2";
+	};
+};
+
+&usb2_phy2 {
+	pinctrl-0 = <&usb2_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+};
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1662347 — [PATCH 3/4] arm64: dts: renesas: Add common Salvator-XS board support

FromGeert Uytterhoeven <geert+renesas@glider.be>
Date2017-06-09 13:50 +0200
Subject[PATCH 3/4] arm64: dts: renesas: Add common Salvator-XS board support
Message-ID<tQqAr-Yw-39@gated-at.bofh.it>
In reply to#1662342
The Renesas Salvator-XS (Salvator-X 2nd version) development board can
be equipped with either an R-Car H3 ES2.0 or M3-W ES1.x SiP, which are
pin-compatible.

Add initial support for the common parts of the Salvator-XS board into
its own .dtsi file, to be included by the DTSes for the H3/M3-W
versions.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm64/boot/dts/renesas/salvator-xs.dtsi | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 arch/arm64/boot/dts/renesas/salvator-xs.dtsi

diff --git a/arch/arm64/boot/dts/renesas/salvator-xs.dtsi b/arch/arm64/boot/dts/renesas/salvator-xs.dtsi
new file mode 100644
index 0000000000000000..81227e3c2c6f1e2d
--- /dev/null
+++ b/arch/arm64/boot/dts/renesas/salvator-xs.dtsi
@@ -0,0 +1,20 @@
+/*
+ * Device Tree Source for the Salvator-X 2nd version board
+ *
+ * Copyright (C) 2015-2017 Renesas Electronics Corp.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#include "salvator-common.dtsi"
+
+/ {
+	model = "Renesas Salvator-X 2nd version board";
+	compatible = "renesas,salvator-xs";
+};
+
+&extal_clk {
+	clock-frequency = <16640000>;
+};
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1662354 — [PATCH 1/4] ARM: shmobile: Document Renesas H3-based Salvator-XS board DT bindings

FromGeert Uytterhoeven <geert+renesas@glider.be>
Date2017-06-09 13:50 +0200
Subject[PATCH 1/4] ARM: shmobile: Document Renesas H3-based Salvator-XS board DT bindings
Message-ID<tQqAs-Yw-59@gated-at.bofh.it>
In reply to#1662342
The Renesas Salvator-XS (Salvator-X 2nd version) development board can
be equipped with either an R-Car H3 ES2.0 or M3-W ES1.x SiP, which are
pin-compatible.

Document board part number and compatible values for the version with
R-Car H3.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 Documentation/devicetree/bindings/arm/shmobile.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
index 63dcae4f72ce8e4e..1a671e3298643d9e 100644
--- a/Documentation/devicetree/bindings/arm/shmobile.txt
+++ b/Documentation/devicetree/bindings/arm/shmobile.txt
@@ -88,6 +88,8 @@ Boards:
     compatible = "renesas,salvator-x", "renesas,r8a7795";
   - Salvator-X (RTP0RC7796SIPB0011S)
     compatible = "renesas,salvator-x", "renesas,r8a7796";
+  - Salvator-XS (Salvator-X 2nd version, RTP0RC7795SIPB0012S)
+    compatible = "renesas,salvator-xs", "renesas,r8a7795";
   - SILK (RTP0RC7794LCB00011S)
     compatible = "renesas,silk", "renesas,r8a7794"
   - SK-RZG1E (YR8A77450S000BE)
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1668608 — Re: [PATCH 1/4] ARM: shmobile: Document Renesas H3-based Salvator-XS board DT bindings

FromRob Herring <robh@kernel.org>
Date2017-06-18 16:10 +0200
SubjectRe: [PATCH 1/4] ARM: shmobile: Document Renesas H3-based Salvator-XS board DT bindings
Message-ID<tTJ3R-670-29@gated-at.bofh.it>
In reply to#1662354
On Fri, Jun 09, 2017 at 01:43:46PM +0200, Geert Uytterhoeven wrote:
> The Renesas Salvator-XS (Salvator-X 2nd version) development board can
> be equipped with either an R-Car H3 ES2.0 or M3-W ES1.x SiP, which are
> pin-compatible.
> 
> Document board part number and compatible values for the version with
> R-Car H3.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
>  Documentation/devicetree/bindings/arm/shmobile.txt | 2 ++
>  1 file changed, 2 insertions(+)

Acked-by: Rob Herring <robh@kernel.org>

[toc] | [prev] | [next] | [standalone]

#1663344

FromSimon Horman <horms@verge.net.au>
Date2017-06-12 11:20 +0200
Message-ID<tRtFT-fr-3@gated-at.bofh.it>
In reply to#1662342
On Fri, Jun 09, 2017 at 01:43:45PM +0200, Geert Uytterhoeven wrote:
> 	Hi Simon, Magnus,
> 
> The Renesas Salvator-XS (Salvator-X 2nd version) development board can
> be equipped with either an R-Car H3 ES2.0 or M3-W ES1.x SiP, which are
> pin-compatible.
> 
> This patch series adds initial support for the Renesas Salvator-XS
> development board equipped with an R-Car H3 ES2.0 SiP.  The support
> level is similar to the existing support for Salvator-X with the same
> SiP.  See below for exceptions.
> 
> The Salvator-XS board is similar but not identical to the already
> supported Salvator-X board.  To avoid duplication, the common parts are
> extracted first into its own .dtsi file.
> Noteworthy differences are:
>   - The main clock crystal ticks at a slightly different rate.
>   - On R-Car H3 ES2.0, SATA no longer uses dedicated pins, but shares
>     them with the second PCIe channel.  To cater for this, a MAX4888B
>     multiplexer has been added to Salvator-XS.  As the default hardware
>     configuration enables PCIe, I disabled SATA.
>   - The Versaclock5 clock generator has been replaced by a similar
>     member of the Versaclock6 family.  As the latter is not supported by
>     Linux yet, I left it out.
>   - The USB3.0 micro-B connector is replaced by a USB2.0 micro-AB
>     connector (both are not yet supported, so no change is needed now).
> 
> Dependencies:
>   - renesas-devel-20170608-v4.12-rc4,
>   - "arm64: dts: salvator-x: Add missing index to PWM pinctrl subnode
>     name".
> 
> For your convenience, I've pushed this series, its dependencies, and a
> few related driver changes to the topic/r8a7795-salvator-xs branch of
> the git repository at
> https://git.kernel.org/cgit/linux/kernel/git/geert/renesas-drivers.git
> 
> This has been tested on Salvator-XS with R-Car H3 ES2.0, and Salvator-X
> with R-Car H3 ES1.0.
> 
> Thanks!

Thanks, I have queued this up for v4.13.

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web