Skip to contentSkip to conversation

Renesas RZ/G1N extend peripherals supported by platform

PATCH New Lad Prabhakar 3 participants 18 messages Jan 24, 2020 – Jan 27, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover Renesas RZ/G1N extend peripherals supported by platform

This patch series adds support for following peripherals supported by RZ/G1N:
1: VSP
2: PWM
3: TPU
4: QSPI
5: MSIOF
6: xHCI
7: PCiec
8: NOR flash for iwg20m

This patch series is based on linux-4.4.y-cip and all the patches in this series are cherry-picked from upstream apart from "usb: host: xhci-plat: Add r8a7744 support" patch.

Biju Das (9):
ARM: dts: r8a7744: Add VSP support
ARM: dts: r8a7744: Add PWM SoC support
ARM: dts: r8a7744: Add TPU support
ARM: dts: r8a7744: Add QSPI support
ARM: dts: r8a7744: Add MSIOF[012] support
ARM: dts: r8a7744-iwg20m: Add SPI NOR support
dt-bindings: usb-xhci: Document r8a7744 support
ARM: dts: r8a7744: Add xhci support
ARM: dts: r8a7744: Add PCIe Controller device node

Lad Prabhakar (1):
usb: host: xhci-plat: Add r8a7744 support

 Documentation/devicetree/bindings/usb/usb-xhci.txt |   3 +-
 arch/arm/boot/dts/r8a7744-iwg20m.dtsi              |  26 +++
 arch/arm/boot/dts/r8a7744.dtsi                     | 219 +++++++++++++++++++++
 drivers/usb/host/xhci-plat.c                       |   7 +-
 4 files changed, 252 insertions(+), 3 deletions(-)
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/10 ARM: dts: r8a7744: Add VSP support

From: Biju Das <[email protected]>

commit eddcbe813dd3c8247840859bf4d04b3423d35f8f upstream.

Add VSP support to SoC DT.

(dropped resets property. changed clocks and power-domains properties. added vsp device configuration)

---
 arch/arm/boot/dts/r8a7744.dtsi | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
arch/arm/boot/dts/r8a7744.dtsi +42 -0
index 91e032a..cf7d8fe 100644
@@ -1277,6 +1277,48 @@
 			power-domains = <&cpg_clocks>;
 		};
 
+		vsp at fe928000 {
+			compatible = "renesas,vsp1";
+			reg = <0 0xfe928000 0 0x8000>;
+			interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&mstp1_clks R8A7744_CLK_VSP1_S>;
+			power-domains = <&cpg_clocks>;
+
+			renesas,has-lut;
+			renesas,has-sru;
+			renesas,#rpf = <5>;
+			renesas,#uds = <1>;
+			renesas,#wpf = <4>;
+		};
+
+		vsp at fe930000 {
+			compatible = "renesas,vsp1";
+			reg = <0 0xfe930000 0 0x8000>;
+			interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&mstp1_clks R8A7744_CLK_VSP1_DU0>;
+			power-domains = <&cpg_clocks>;
+
+			renesas,has-lif;
+			renesas,has-lut;
+			renesas,#rpf = <4>;
+			renesas,#uds = <1>;
+			renesas,#wpf = <1>;
+		};
+
+		vsp at fe938000 {
+			compatible = "renesas,vsp1";
+			reg = <0 0xfe938000 0 0x8000>;
+			interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&mstp1_clks R8A7744_CLK_VSP1_DU1>;
+			power-domains = <&cpg_clocks>;
+
+			renesas,has-lif;
+			renesas,has-lut;
+			renesas,#rpf = <4>;
+			renesas,#uds = <1>;
+			renesas,#wpf = <1>;
+		};
+
 		du: display at feb00000 {
 			compatible = "renesas,du-r8a7744";
 			reg = <0 0xfeb00000 0 0x40000>,
Signature · 1 line
2.7.4
#2 lore raw

PATCH 2/10 ARM: dts: r8a7744: Add PWM SoC support

In reply to Lad Prabhakar

From: Biju Das <[email protected]>

commit cebc31e8b59445aaf84b8810ff76b2fcc246fea2 upstream.

Add the definitions for pwm[0123456] to the SoC dtsi.

(updated clocks and power-domains property.removed resets property)

---
 arch/arm/boot/dts/r8a7744.dtsi | 63 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
arch/arm/boot/dts/r8a7744.dtsi +63 -0
index cf7d8fe..79c71ef 100644
@@ -847,6 +847,69 @@
 			status = "disabled";
 		};
 
+		pwm0: pwm at e6e30000 {
+			compatible = "renesas,pwm-r8a7744", "renesas,pwm-rcar";
+			reg = <0 0xe6e30000 0 0x8>;
+			clocks = <&mstp5_clks R8A7744_CLK_PWM>;
+			power-domains = <&cpg_clocks>;
+			#pwm-cells = <2>;
+			status = "disabled";
+		};
+
+		pwm1: pwm at e6e31000 {
+			compatible = "renesas,pwm-r8a7744", "renesas,pwm-rcar";
+			reg = <0 0xe6e31000 0 0x8>;
+			clocks = <&mstp5_clks R8A7744_CLK_PWM>;
+			power-domains = <&cpg_clocks>;
+			#pwm-cells = <2>;
+			status = "disabled";
+		};
+
+		pwm2: pwm at e6e32000 {
+			compatible = "renesas,pwm-r8a7744", "renesas,pwm-rcar";
+			reg = <0 0xe6e32000 0 0x8>;
+			clocks = <&mstp5_clks R8A7744_CLK_PWM>;
+			power-domains = <&cpg_clocks>;
+			#pwm-cells = <2>;
+			status = "disabled";
+		};
+
+		pwm3: pwm at e6e33000 {
+			compatible = "renesas,pwm-r8a7744", "renesas,pwm-rcar";
+			reg = <0 0xe6e33000 0 0x8>;
+			clocks = <&mstp5_clks R8A7744_CLK_PWM>;
+			power-domains = <&cpg_clocks>;
+			#pwm-cells = <2>;
+			status = "disabled";
+		};
+
+		pwm4: pwm at e6e34000 {
+			compatible = "renesas,pwm-r8a7744", "renesas,pwm-rcar";
+			reg = <0 0xe6e34000 0 0x8>;
+			clocks = <&mstp5_clks R8A7744_CLK_PWM>;
+			power-domains = <&cpg_clocks>;
+			#pwm-cells = <2>;
+			status = "disabled";
+		};
+
+		pwm5: pwm at e6e35000 {
+			compatible = "renesas,pwm-r8a7744", "renesas,pwm-rcar";
+			reg = <0 0xe6e35000 0 0x8>;
+			clocks = <&mstp5_clks R8A7744_CLK_PWM>;
+			power-domains = <&cpg_clocks>;
+			#pwm-cells = <2>;
+			status = "disabled";
+		};
+
+		pwm6: pwm at e6e36000 {
+			compatible = "renesas,pwm-r8a7744", "renesas,pwm-rcar";
+			reg = <0 0xe6e36000 0 0x8>;
+			clocks = <&mstp5_clks R8A7744_CLK_PWM>;
+			power-domains = <&cpg_clocks>;
+			#pwm-cells = <2>;
+			status = "disabled";
+		};
+
 		can0: can at e6e80000 {
 			compatible = "renesas,can-r8a7744",
 				     "renesas,rcar-gen2-can";
Signature · 1 line
2.7.4
#3 lore raw

PATCH 3/10 ARM: dts: r8a7744: Add TPU support

In reply to Lad Prabhakar

From: Biju Das <[email protected]>

commit eb83d144978e9f21aaa1372d75b50f3eec22ed48 upstream.

Add TPU support to SoC DT.

(updated clock and power-domains property. removed resets property)

---
 arch/arm/boot/dts/r8a7744.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)
arch/arm/boot/dts/r8a7744.dtsi +9 -0
index 79c71ef..425915a 100644
@@ -260,6 +260,15 @@
 			reg = <0 0xe6060000 0 0x250>;
 		};
 
+		tpu: pwm at e60f0000 {
+			compatible = "renesas,tpu-r8a7744", "renesas,tpu";
+			reg = <0 0xe60f0000 0 0x148>;
+			clocks = <&mstp3_clks R8A7744_CLK_TPU0>;
+			power-domains = <&cpg_clocks>;
+			#pwm-cells = <3>;
+			status = "disabled";
+		};
+
 		apmu at e6152000 {
 			compatible = "renesas,r8a7744-apmu", "renesas,apmu";
 			reg = <0 0xe6152000 0 0x188>;
Signature · 1 line
2.7.4
#4 lore raw

PATCH 4/10 ARM: dts: r8a7744: Add QSPI support

In reply to Lad Prabhakar

From: Biju Das <[email protected]>

commit 0faadd5a410533d3a75601b607ee5a4110b754f4 upstream.

Add the DT node for the QSPI interface to the SoC dtsi.

(changed clocks and power-domains property, removed resets property)

---
 arch/arm/boot/dts/r8a7744.dtsi | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
arch/arm/boot/dts/r8a7744.dtsi +15 -0
index 425915a..b6517c3 100644
@@ -595,6 +595,21 @@
 			status = "disabled";
 		};
 
+		qspi: spi at e6b10000 {
+			compatible = "renesas,qspi-r8a7744", "renesas,qspi";
+			reg = <0 0xe6b10000 0 0x2c>;
+			interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&mstp9_clks R8A7744_CLK_QSPI_MOD>;
+			dmas = <&dmac0 0x17>, <&dmac0 0x18>,
+			       <&dmac1 0x17>, <&dmac1 0x18>;
+			dma-names = "tx", "rx", "tx", "rx";
+			power-domains = <&cpg_clocks>;
+			num-cs = <1>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
+
 		scifa0: serial at e6c40000 {
 			compatible = "renesas,scifa-r8a7744",
 				     "renesas,rcar-gen2-scifa", "renesas,scifa";
Signature · 1 line
2.7.4
#5 lore raw

PATCH 5/10 ARM: dts: r8a7744: Add MSIOF[012] support

In reply to Lad Prabhakar

From: Biju Das <[email protected]>

commit 491e70588805a8895bff6ac5a626c8bb481fea1c upstream.

Add the DT nodes needed by MSIOF[012] interfaces to the SoC dtsi.

(changed clocks and power-domains properties, removed resets property)

---
 arch/arm/boot/dts/r8a7744.dtsi | 45 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
arch/arm/boot/dts/r8a7744.dtsi +45 -0
index b6517c3..12d698c 100644
@@ -934,6 +934,51 @@
 			status = "disabled";
 		};
 
+		msiof0: spi at e6e20000 {
+			compatible = "renesas,msiof-r8a7744",
+				     "renesas,rcar-gen2-msiof";
+			reg = <0 0xe6e20000 0 0x0064>;
+			interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&mstp0_clks R8A7744_CLK_MSIOF0>;
+			dmas = <&dmac0 0x51>, <&dmac0 0x52>,
+			       <&dmac1 0x51>, <&dmac1 0x52>;
+			dma-names = "tx", "rx", "tx", "rx";
+			power-domains = <&cpg_clocks>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
+
+		msiof1: spi at e6e10000 {
+			compatible = "renesas,msiof-r8a7744",
+				     "renesas,rcar-gen2-msiof";
+			reg = <0 0xe6e10000 0 0x0064>;
+			interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&mstp2_clks R8A7744_CLK_MSIOF1>;
+			dmas = <&dmac0 0x55>, <&dmac0 0x56>,
+			       <&dmac1 0x55>, <&dmac1 0x56>;
+			dma-names = "tx", "rx", "tx", "rx";
+			power-domains = <&cpg_clocks>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
+
+		msiof2: spi at e6e00000 {
+			compatible = "renesas,msiof-r8a7744",
+				     "renesas,rcar-gen2-msiof";
+			reg = <0 0xe6e00000 0 0x0064>;
+			interrupts = <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&mstp2_clks R8A7744_CLK_MSIOF2>;
+			dmas = <&dmac0 0x41>, <&dmac0 0x42>,
+			       <&dmac1 0x41>, <&dmac1 0x42>;
+			dma-names = "tx", "rx", "tx", "rx";
+			power-domains = <&cpg_clocks>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
+
 		can0: can at e6e80000 {
 			compatible = "renesas,can-r8a7744",
 				     "renesas,rcar-gen2-can";
Signature · 1 line
2.7.4
#6 lore raw

PATCH 6/10 ARM: dts: r8a7744-iwg20m: Add SPI NOR support

In reply to Lad Prabhakar

From: Biju Das <[email protected]>

commit e259e04748e2798a747d9c363ded50514b15a7b9 upstream.

Add support for the SPI NOR device used to boot up the system to the iWave RZ/G1N Qseven System On Module DT.

---
 arch/arm/boot/dts/r8a7744-iwg20m.dtsi | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
arch/arm/boot/dts/r8a7744-iwg20m.dtsi +26 -0
index 503583e..82ee3c1 100644
@@ -36,6 +36,11 @@
 		function = "mmc";
 	};
 
+	qspi_pins: qspi {
+		groups = "qspi_ctrl", "qspi_data2";
+		function = "qspi";
+	};
+
 	sdhi0_pins: sd0 {
 		groups = "sdhi0_data4", "sdhi0_ctrl";
 		function = "sdhi0";
@@ -53,6 +58,27 @@
 	status = "okay";
 };
 
+&qspi {
+	pinctrl-0 = <&qspi_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+
+	/* WARNING - This device contains the bootloader. Handle with care. */
+	flash: flash at 0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <50000000>;
+		spi-tx-bus-width = <2>;
+		spi-rx-bus-width = <2>;
+		m25p,fast-read;
+		spi-cpol;
+		spi-cpha;
+	};
+};
+
 &sdhi0 {
 	pinctrl-0 = <&sdhi0_pins>;
 	pinctrl-names = "default";
Signature · 1 line
2.7.4
#7 lore raw

PATCH 7/10 usb: host: xhci-plat: Add r8a7744 support

In reply to Lad Prabhakar

This patch adds xhci r8a7744 driver support.

---
 drivers/usb/host/xhci-plat.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/usb/host/xhci-plat.c +5 -2
index 8f80da4..e7f00da 100644
@@ -54,7 +54,8 @@ static int xhci_plat_setup(struct usb_hcd *hcd)
 
 	if (of_device_is_compatible(of_node, "renesas,xhci-r8a7790") ||
 	    of_device_is_compatible(of_node, "renesas,xhci-r8a7791") ||
-	    of_device_is_compatible(of_node, "renesas,xhci-r8a7743")) {
+	    of_device_is_compatible(of_node, "renesas,xhci-r8a7743") ||
+	    of_device_is_compatible(of_node, "renesas,xhci-r8a7744")) {
 		ret = xhci_rcar_init_quirk(hcd);
 		if (ret)
 			return ret;
@@ -69,7 +70,8 @@ static int xhci_plat_start(struct usb_hcd *hcd)
 
 	if (of_device_is_compatible(of_node, "renesas,xhci-r8a7790") ||
 	    of_device_is_compatible(of_node, "renesas,xhci-r8a7791") ||
-	    of_device_is_compatible(of_node, "renesas,xhci-r8a7743"))
+	    of_device_is_compatible(of_node, "renesas,xhci-r8a7743") ||
+	    of_device_is_compatible(of_node, "renesas,xhci-r8a7744"))
 		xhci_rcar_start(hcd);
 
 	return xhci_run(hcd);
@@ -270,6 +272,7 @@ static const struct of_device_id usb_xhci_of_match[] = {
 	{ .compatible = "marvell,armada-375-xhci"},
 	{ .compatible = "marvell,armada-380-xhci"},
 	{ .compatible = "renesas,xhci-r8a7743"},
+	{ .compatible = "renesas,xhci-r8a7744"},
 	{ .compatible = "renesas,xhci-r8a7790"},
 	{ .compatible = "renesas,xhci-r8a7791"},
 	{ },
Signature · 1 line
2.7.4
#8 lore raw

PATCH 7/10 usb: host: xhci-plat: Add r8a7744 support

Hi All,

Quoted 9 lines

-----Original Message-----
From: cip-dev <[email protected]> On Behalf Of Lad Prabhakar
Sent: 24 January 2020 09:08
To: cip-dev at lists.cip-project.org; Nobuhiro Iwamatsu <[email protected]>; Pavel Machek <[email protected]>
Subject: [cip-dev] [PATCH 4.4.y-cip 07/10] usb: host: xhci-plat: Add r8a7744 support

Quoted 7 lines

This patch adds xhci r8a7744 driver support.

---
 drivers/usb/host/xhci-plat.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Just a background wrt this patch as this isn't a backport from mainline kernel, in mainline kernel for RZ/G1 the compatible string defaults to "renesas,rcar-gen2-xhci" which isn't present in CIP, and the way xhci-plat.c in cip handles compatibility is different compared to mainline as a result this patch is added This is patch is similar to " usb: host: xhci-plat: Add r8a7743 support" (d09ccbb733864223402b541bdb9897cfe811881c) present in cip kernel.

Cheers,
--Prabhakar Lad

Quoted 36 lines
drivers/usb/host/xhci-plat.c index renamed from drivers/usb/host/xhci-plat.c +0 -0

8f80da4..e7f00da 100644

drivers/usb/host/xhci-plat.c +5 -2
@@ -54,7 +54,8 @@ static int xhci_plat_setup(struct usb_hcd *hcd)
 
 if (of_device_is_compatible(of_node, "renesas,xhci-r8a7790") ||
     of_device_is_compatible(of_node, "renesas,xhci-r8a7791") ||
-    of_device_is_compatible(of_node, "renesas,xhci-r8a7743")) {
+    of_device_is_compatible(of_node, "renesas,xhci-r8a7743") ||
+    of_device_is_compatible(of_node, "renesas,xhci-r8a7744")) {
 ret = xhci_rcar_init_quirk(hcd);
 if (ret)
 return ret;
@@ -69,7 +70,8 @@ static int xhci_plat_start(struct usb_hcd *hcd)
 
 if (of_device_is_compatible(of_node, "renesas,xhci-r8a7790") ||
     of_device_is_compatible(of_node, "renesas,xhci-r8a7791") ||
-    of_device_is_compatible(of_node, "renesas,xhci-r8a7743"))
+    of_device_is_compatible(of_node, "renesas,xhci-r8a7743") ||
+    of_device_is_compatible(of_node, "renesas,xhci-r8a7744"))
 xhci_rcar_start(hcd);
 
 return xhci_run(hcd);
@@ -270,6 +272,7 @@ static const struct of_device_id usb_xhci_of_match[]
 = {
 { .compatible = "marvell,armada-375-xhci"},
 { .compatible = "marvell,armada-380-xhci"},
 { .compatible = "renesas,xhci-r8a7743"},
+{ .compatible = "renesas,xhci-r8a7744"},
 { .compatible = "renesas,xhci-r8a7790"},
 { .compatible = "renesas,xhci-r8a7791"},

{ },
--
2.7.4

Quoted 4 lines

_______________________________________________
cip-dev mailing list
cip-dev at lists.cip-project.org
https://lists.cip-project.org/mailman/listinfo/cip-dev

Renesas Electronics Europe GmbH, Geschaeftsfuehrer/President: Carsten Jauch, Sitz der Gesellschaft/Registered office: Duesseldorf, Arcadiastrasse 10, 40472 Duesseldorf, Germany, Handelsregister/Commercial Register: Duesseldorf, HRB 3708 USt-IDNr./Tax identification no.: DE 119353406 WEEE-Reg.-Nr./WEEE reg. no.: DE 14978647

#9 lore raw

PATCH 7/10 usb: host: xhci-plat: Add r8a7744 support

Hi Prabhakar,

Quoted 31 lines

-----Original Message-----
From: Prabhakar Mahadev Lad
[mailto:prabhakar.mahadev-lad.rj at bp.renesas.com]
Sent: Friday, January 24, 2020 7:13 PM
To: Prabhakar Mahadev Lad <[email protected]>; cip-dev at lists.cip-project.org; iwamatsu nobuhiro(?? ?? ????? ???) <[email protected]>; Pavel Machek <[email protected]>
Cc: Chris Paterson <[email protected]>
Subject: RE: [cip-dev] [PATCH 4.4.y-cip 07/10] usb: host: xhci-plat: Add r8a7744 support

Hi All,

Quoted 9 lines

-----Original Message-----
From: cip-dev <[email protected]> On Behalf Of Lad Prabhakar
Sent: 24 January 2020 09:08
To: cip-dev at lists.cip-project.org; Nobuhiro Iwamatsu <[email protected]>; Pavel Machek <[email protected]>
Subject: [cip-dev] [PATCH 4.4.y-cip 07/10] usb: host: xhci-plat: Add r8a7744 support

Quoted 3 lines

This patch adds xhci r8a7744 driver support.

Signed-off-by Lad Prabhakar

<[email protected]>

Quoted 4 lines
---
 drivers/usb/host/xhci-plat.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
Quoted 7 lines

Just a background wrt this patch as this isn't a backport from mainline kernel, in mainline kernel for RZ/G1 the compatible string defaults to "renesas,rcar-gen2-xhci" which isn't present in CIP, and the way xhci-plat.c in cip handles compatibility is different compared to mainline as a result this patch is added This is patch is similar to "
usb: host: xhci-plat: Add r8a7743 support" (d09ccbb733864223402b541bdb9897cfe811881c) present in cip kernel.

Thanks for your additional information.
I will add the above comment to the commit message and commit.

Best regards,
Nobuhiro

#10 lore raw

PATCH 7/10 usb: host: xhci-plat: Add r8a7744 support

Hi Nobuhiro,

Quoted 53 lines

-----Original Message-----
From: nobuhiro1.iwamatsu at toshiba.co.jp <[email protected]>
Sent: 26 January 2020 22:07
To: Prabhakar Mahadev Lad <[email protected]>; cip-dev at lists.cip-project.org; pavel at denx.de
Cc: Chris Paterson <[email protected]>
Subject: RE: [cip-dev] [PATCH 4.4.y-cip 07/10] usb: host: xhci-plat: Add r8a7744 support

Hi Prabhakar,

Quoted 5 lines

-----Original Message-----
From: Prabhakar Mahadev Lad [mailto:prabhakar.mahadev-lad.rj at bp.renesas.com]
Sent: Friday, January 24, 2020 7:13 PM
To: Prabhakar Mahadev Lad <prabhakar.mahadev-

lad.rj at bp.renesas.com>;

Quoted 2 lines

cip-dev at lists.cip-project.org; iwamatsu nobuhiro(?? ?? ????? ???) <[email protected]>; Pavel Machek

<[email protected]>

Quoted 24 lines

Cc: Chris Paterson <[email protected]>
Subject: RE: [cip-dev] [PATCH 4.4.y-cip 07/10] usb: host: xhci-plat:
Add
r8a7744 support

Hi All,

Quoted 9 lines

-----Original Message-----
From: cip-dev <[email protected]> On Behalf Of Lad Prabhakar
Sent: 24 January 2020 09:08
To: cip-dev at lists.cip-project.org; Nobuhiro Iwamatsu <[email protected]>; Pavel Machek <[email protected]>
Subject: [cip-dev] [PATCH 4.4.y-cip 07/10] usb: host: xhci-plat: Add r8a7744 support

Quoted 3 lines

This patch adds xhci r8a7744 driver support.

Signed-off-by Lad Prabhakar

<[email protected]>

Quoted 4 lines
---
 drivers/usb/host/xhci-plat.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
Quoted 7 lines

Just a background wrt this patch as this isn't a backport from mainline kernel, in mainline kernel for RZ/G1 the compatible string defaults to "renesas,rcar-gen2-xhci" which isn't present in CIP, and the way xhci-plat.c in cip handles compatibility is different compared to mainline as a result this patch is added This is patch is similar to "
usb: host: xhci-plat: Add r8a7743 support" (d09ccbb733864223402b541bdb9897cfe811881c) present in cip kernel.

Quoted 3 lines

Thanks for your additional information.
I will add the above comment to the commit message and commit.

Thank you.

Cheers,
--Prabhakar

Renesas Electronics Europe GmbH, Geschaeftsfuehrer/President: Carsten Jauch, Sitz der Gesellschaft/Registered office: Duesseldorf, Arcadiastrasse 10, 40472 Duesseldorf, Germany, Handelsregister/Commercial Register: Duesseldorf, HRB 3708 USt-IDNr./Tax identification no.: DE 119353406 WEEE-Reg.-Nr./WEEE reg. no.: DE 14978647

#11 lore raw

PATCH 8/10 dt-bindings: usb-xhci: Document r8a7744 support

In reply to Lad Prabhakar

From: Biju Das <[email protected]>

commit 2cfe8f864d0e2504dc2f68f0b04668d877f7c7b4 upstream.

Document r8a7744 xhci support. The driver will use the fallback compatible string "renesas,rcar-gen2-xhci", therefore no driver change is needed.

---
 Documentation/devicetree/bindings/usb/usb-xhci.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/usb/usb-xhci.txt +2 -1
index fce0320..bf5192b 100644
@@ -3,7 +3,8 @@ USB xHCI controllers
 Required properties:
   - compatible: should be one of "generic-xhci",
     "marvell,armada-375-xhci", "marvell,armada-380-xhci",
-    "renesas,xhci-r8a7790", "renesas,xhci-r8a7791", "renesas,xhci-r8a7743"
+    "renesas,xhci-r8a7790", "renesas,xhci-r8a7791", "renesas,xhci-r8a7743",
+    "renesas,xhci-r8a7744"
     (deprecated: "xhci-platform").
   - reg: should contain address and length of the standard XHCI
     register set for the device.
Signature · 1 line
2.7.4
#12 lore raw

PATCH 9/10 ARM: dts: r8a7744: Add xhci support

In reply to Lad Prabhakar

From: Biju Das <[email protected]>

commit 54234e80858cf3730917d71af80a13ac4b8f26dc upstream.

Add a device node for the xhci controller on the Renesas RZ/G1N (r8a7744) SoC.

(dropped resets property. changed clocks and power-domains properties. dropped "renesas,rcar-gen2-xhci" compatible string)

---
 arch/arm/boot/dts/r8a7744.dtsi | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
arch/arm/boot/dts/r8a7744.dtsi +18 -0
index 12d698c..195d1d7 100644
@@ -1274,6 +1274,24 @@
 			dma-channels = <13>;
 		};
 
+		/*
+		 * pci1 and xhci share the same phy, therefore only one of them
+		 * can be active at any one time. If both of them are enabled,
+		 * a race condition will determine who'll control the phy.
+		 * A firmware file is needed by the xhci driver in order for
+		 * USB 3.0 to work properly.
+		 */
+		xhci: usb at ee000000 {
+			compatible = "renesas,xhci-r8a7744";
+			reg = <0 0xee000000 0 0xc00>;
+			interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&mstp3_clks R8A7744_CLK_SSUSB>;
+			power-domains = <&cpg_clocks>;
+			phys = <&usb2 1>;
+			phy-names = "usb";
+			status = "disabled";
+		};
+
 		pci0: pci at ee090000 {
 			compatible = "renesas,pci-r8a7744",
 				     "renesas,pci-rcar-gen2";
Signature · 1 line
2.7.4
#13 lore raw

PATCH 10/10 ARM: dts: r8a7744: Add PCIe Controller device node

In reply to Lad Prabhakar

From: Biju Das <[email protected]>

commit 24035072999c5c175ac03ed2db2ef98cb339b319 upstream.

Add a device node for the PCIe controller on the Renesas RZ/G1N (r8a7744) SoC.

(dropped resets property. changed clocks and power-domains properties.)

---
 arch/arm/boot/dts/r8a7744.dtsi | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
arch/arm/boot/dts/r8a7744.dtsi +27 -0
index 195d1d7..9e1885c 100644
@@ -1469,6 +1469,33 @@
 			renesas,#wpf = <1>;
 		};
 
+		pciec: pcie at fe000000 {
+			compatible = "renesas,pcie-r8a7744",
+				     "renesas,pcie-rcar-gen2";
+			reg = <0 0xfe000000 0 0x80000>;
+			#address-cells = <3>;
+			#size-cells = <2>;
+			bus-range = <0x00 0xff>;
+			device_type = "pci";
+			ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000
+				  0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000
+				  0x02000000 0 0x30000000 0 0x30000000 0 0x08000000
+				  0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
+			/* Map all possible DDR as inbound ranges */
+			dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000
+				      0x43000000 2 0x00000000 2 0x00000000 1 0x00000000>;
+			interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
+			#interrupt-cells = <1>;
+			interrupt-map-mask = <0 0 0 0>;
+			interrupt-map = <0 0 0 0 &gic GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&mstp3_clks R8A7744_CLK_PCIEC>, <&pcie_bus_clk>;
+			clock-names = "pcie", "pcie_bus";
+			power-domains = <&cpg_clocks>;
+			status = "disabled";
+		};
+
 		du: display at feb00000 {
 			compatible = "renesas,du-r8a7744";
 			reg = <0 0xfeb00000 0 0x40000>,
Signature · 1 line
2.7.4
#14 lore raw

cover Renesas RZ/G1N extend peripherals supported by platform

In reply to Lad Prabhakar

Hi Lad,

Quoted 40 lines

-----Original Message-----
From: Lad Prabhakar [mailto:prabhakar.mahadev-lad.rj at bp.renesas.com]
Sent: Friday, January 24, 2020 6:08 PM
To: cip-dev at lists.cip-project.org; iwamatsu nobuhiro(?? ?? ??? ?????) <[email protected]>; Pavel Machek <[email protected]>
Cc: Chris Paterson <[email protected]>
Subject: [PATCH 4.4.y-cip 00/10] Renesas RZ/G1N extend peripherals supported by platform

This patch series adds support for following peripherals supported by RZ/G1N:
1: VSP
2: PWM
3: TPU
4: QSPI
5: MSIOF
6: xHCI
7: PCiec
8: NOR flash for iwg20m

This patch series is based on linux-4.4.y-cip and all the patches in this series are cherry-picked from upstream apart from "usb: host: xhci-plat:
Add r8a7744 support"
patch.

Biju Das (9):
ARM: dts: r8a7744: Add VSP support
ARM: dts: r8a7744: Add PWM SoC support
ARM: dts: r8a7744: Add TPU support
ARM: dts: r8a7744: Add QSPI support
ARM: dts: r8a7744: Add MSIOF[012] support
ARM: dts: r8a7744-iwg20m: Add SPI NOR support
dt-bindings: usb-xhci: Document r8a7744 support
ARM: dts: r8a7744: Add xhci support
ARM: dts: r8a7744: Add PCIe Controller device node

Lad Prabhakar (1):
usb: host: xhci-plat: Add r8a7744 support

Quoted 7 lines
 Documentation/devicetree/bindings/usb/usb-xhci.txt |   3 +-
 arch/arm/boot/dts/r8a7744-iwg20m.dtsi              |  26 +++
 arch/arm/boot/dts/r8a7744.dtsi                     | 219
+++++++++++++++++++++
 drivers/usb/host/xhci-plat.c                       |   7 +-
 4 files changed, 252 insertions(+), 3 deletions(-)

Looks good to me.
I will apply this series if there is no objection.

Best regards,
Nobuhiro

#15 lore raw

cover Renesas RZ/G1N extend peripherals supported by platform

Hi Nobuhiro,

Quoted 61 lines

-----Original Message-----
From: nobuhiro1.iwamatsu at toshiba.co.jp <[email protected]>
Sent: 26 January 2020 22:16
To: Prabhakar Mahadev Lad <[email protected]>; cip-dev at lists.cip-project.org; pavel at denx.de
Cc: Chris Paterson <[email protected]>
Subject: RE: [PATCH 4.4.y-cip 00/10] Renesas RZ/G1N extend peripherals supported by platform

Hi Lad,

Quoted 21 lines

-----Original Message-----
From: Lad Prabhakar [mailto:prabhakar.mahadev-lad.rj at bp.renesas.com]
Sent: Friday, January 24, 2020 6:08 PM
To: cip-dev at lists.cip-project.org; iwamatsu nobuhiro(?? ?? ??? ?????) <[email protected]>; Pavel Machek <[email protected]>
Cc: Chris Paterson <[email protected]>
Subject: [PATCH 4.4.y-cip 00/10] Renesas RZ/G1N extend peripherals supported by platform

This patch series adds support for following peripherals supported by RZ/G1N:
1: VSP
2: PWM
3: TPU
4: QSPI
5: MSIOF
6: xHCI
7: PCiec
8: NOR flash for iwg20m

Quoted 2 lines

This patch series is based on linux-4.4.y-cip and all the patches in this series are cherry-picked from upstream apart from "usb: host: xhci-

plat:

Quoted 17 lines

Add r8a7744 support"
patch.

Biju Das (9):
ARM: dts: r8a7744: Add VSP support
ARM: dts: r8a7744: Add PWM SoC support
ARM: dts: r8a7744: Add TPU support
ARM: dts: r8a7744: Add QSPI support
ARM: dts: r8a7744: Add MSIOF[012] support
ARM: dts: r8a7744-iwg20m: Add SPI NOR support
dt-bindings: usb-xhci: Document r8a7744 support
ARM: dts: r8a7744: Add xhci support
ARM: dts: r8a7744: Add PCIe Controller device node

Lad Prabhakar (1):
usb: host: xhci-plat: Add r8a7744 support

Quoted 7 lines
 Documentation/devicetree/bindings/usb/usb-xhci.txt |   3 +-
 arch/arm/boot/dts/r8a7744-iwg20m.dtsi              |  26 +++
 arch/arm/boot/dts/r8a7744.dtsi                     | 219
+++++++++++++++++++++
 drivers/usb/host/xhci-plat.c                       |   7 +-
 4 files changed, 252 insertions(+), 3 deletions(-)
Quoted 3 lines

Looks good to me.
I will apply this series if there is no objection.

Thank you for the review.

Cheers,
--Prabhakar

Renesas Electronics Europe GmbH, Geschaeftsfuehrer/President: Carsten Jauch, Sitz der Gesellschaft/Registered office: Duesseldorf, Arcadiastrasse 10, 40472 Duesseldorf, Germany, Handelsregister/Commercial Register: Duesseldorf, HRB 3708 USt-IDNr./Tax identification no.: DE 119353406 WEEE-Reg.-Nr./WEEE reg. no.: DE 14978647

#16 lore raw

cover Renesas RZ/G1N extend peripherals supported by platform

In reply to nobuhiro1.iwamatsu at toshiba.co.jp

Hi!

Quoted 11 lines
Quoted 10 lines

Lad Prabhakar (1):
usb: host: xhci-plat: Add r8a7744 support

 Documentation/devicetree/bindings/usb/usb-xhci.txt |   3 +-
 arch/arm/boot/dts/r8a7744-iwg20m.dtsi              |  26 +++
 arch/arm/boot/dts/r8a7744.dtsi                     | 219
+++++++++++++++++++++
 drivers/usb/host/xhci-plat.c                       |   7 +-
 4 files changed, 252 insertions(+), 3 deletions(-)
Quoted 2 lines

Looks good to me.
I will apply this series if there is no objection.

Looks good to me, too.

Thanks,
Pavel

Signature · 9 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20200127/80967210/attachment.sig>
#17 lore raw

cover Renesas RZ/G1N extend peripherals supported by platform

Hi,

Quoted 24 lines

-----Original Message-----
From: Pavel Machek [mailto:pavel at denx.de]
Sent: Monday, January 27, 2020 9:04 PM
To: iwamatsu nobuhiro(?? ?? ????????) <[email protected]>
Cc: prabhakar.mahadev-lad.rj at bp.renesas.com;
cip-dev at lists.cip-project.org; pavel at denx.de; chris.paterson2 at renesas.com
Subject: Re: [PATCH 4.4.y-cip 00/10] Renesas RZ/G1N extend peripherals supported by platform

Hi!

Quoted 11 lines
Quoted 10 lines

Lad Prabhakar (1):
usb: host: xhci-plat: Add r8a7744 support

 Documentation/devicetree/bindings/usb/usb-xhci.txt |   3 +-
 arch/arm/boot/dts/r8a7744-iwg20m.dtsi              |  26 +++
 arch/arm/boot/dts/r8a7744.dtsi                     | 219
+++++++++++++++++++++
 drivers/usb/host/xhci-plat.c                       |   7 +-
 4 files changed, 252 insertions(+), 3 deletions(-)
Quoted 4 lines
Quoted 2 lines

Looks good to me.
I will apply this series if there is no objection.

Looks good to me, too.

Thanks! I will apply this series.

Best regards,
Nobuhiro