Skip to contentSkip to conversation

Renesas RZ/G2E backport IPA support along with minor fixes

PATCH New Lad Prabhakar 3 participants 18 messages Jan 16, 2020 – Jan 20, 2020

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

cover Renesas RZ/G2E backport IPA support along with minor fixes

This patch series intends to do the following:
1: Add IPA support
2: Update the CAN bindings
3: Fix display node range
4: Minor tweaks for sorting the nodes
5: Use any protocol available in kernel for ip instead of dhcp 6: Cleanup CPU compatibles

This patch series is based on linux-4.19.y-cip and all the patches in this series are cherry-picked from upstream.

Biju Das (2):
arm64: dts: renesas: r8a774c0: Create thermal zone to support IPA
arm64: dts: renesas: r8a774c0: Add dynamic power coefficient

Eugeniu Rosca (1):
dt-bindings: can: rcar_can: document r8a77965 support

Fabrizio Castro (3):
dt-bindings: can: rcar_can: Complete documentation for RZ/G2[EM]
arm64: dts: renesas: r8a774c0: Add missing assigned-clocks for CAN[01]
arm64: dts: renesas: r8a774c0: cat874: Add definition for 12V
regulator

Geert Uytterhoeven (1):
arm64: dts: renesas: r8a774c0: Fix register range of display node

Jacopo Mondi (1):
arm64: dts: renesas: Update 'vsps' properties for readability

Magnus Damm (1):
arm64: dts: renesas: Use ip=on for bootargs

Robin Murphy (1):
arm64: dts: renesas: r8a774c0: Clean up CPU compatibles

Yoshihiro Kaneko (2):
thermal: rcar_thermal: update calculation formula for R-Car Gen3 SoCs
arm64: dts: renesas: r8a774c0: cat874: Sort nodes

 .../devicetree/bindings/net/can/rcar_can.txt       |  9 +++--
 arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts    | 39 +++++++++++++---------
 arch/arm64/boot/dts/renesas/r8a774c0.dtsi          | 36 +++++++++++++++-----
 arch/arm64/boot/dts/renesas/r8a7795.dtsi           |  2 +-
 arch/arm64/boot/dts/renesas/r8a77965.dtsi          |  2 +-
 arch/arm64/boot/dts/renesas/r8a77970-eagle.dts     |  2 +-
 arch/arm64/boot/dts/renesas/r8a77995.dtsi          |  2 +-
 arch/arm64/boot/dts/renesas/salvator-common.dtsi   |  2 +-
 drivers/thermal/rcar_thermal.c                     | 11 +++++-
 9 files changed, 70 insertions(+), 35 deletions(-)
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/12 dt-bindings: can: rcar_can: document r8a77965 support

From: Eugeniu Rosca <[email protected]>

commit 4f145f14f6b98b5aa0dd91bdae518b3f24f74b37 upstream.

Document the support for rcar_can on R8A77965 SoC devices. Add R8A77965 to the list of SoCs which require the "assigned-clocks" and "assigned-clock-rates" properties (thanks, Sergei).

---
 Documentation/devicetree/bindings/net/can/rcar_can.txt | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
Documentation/devicetree/bindings/net/can/rcar_can.txt +4 -5
index e1d428a..2301331 100644
@@ -31,11 +31,10 @@ Required properties:
 - pinctrl-0: pin control group to be used for this controller.
 - pinctrl-names: must be "default".
 
-Required properties for "renesas,can-r8a7795" and "renesas,can-r8a7796"
-compatible:
-In R8A7795 and R8A7796 SoCs, "clkp2" can be CANFD clock. This is a div6 clock
-and can be used by both CAN and CAN FD controller at the same time. It needs to
-be scaled to maximum frequency if any of these controllers use it. This is done
+Required properties for R8A7795 and R8A7796:
+For the denoted SoCs, "clkp2" can be CANFD clock. This is a div6 clock and can
+be used by both CAN and CAN FD controller at the same time. It needs to be
+scaled to maximum frequency if any of these controllers use it. This is done
 using the below properties:
 
 - assigned-clocks: phandle of clkp2(CANFD) clock.
Signature · 1 line
2.7.4
#2 lore raw

PATCH 2/12 dt-bindings: can: rcar_can: Complete documentation for RZ/G2[EM]

In reply to Lad Prabhakar

From: Fabrizio Castro <[email protected]>

commit 8cb7ec14188649cf2151464050413e2814fd7cf1 upstream.

Add missing RZ/G2[EM] CANFD clock specific documentation.

Fixes 868b7c0f43e61f22 ("dt-bindings: can: rcar_can: Add r8a774a1 support")
Fixes d703a52eb1ebeeba ("dt-bindings: can: rcar_can: Add r8a774c0 support")
[fab: discarded reference to r8a77965 while backporting to v4.19.y-cip]
---
 Documentation/devicetree/bindings/net/can/rcar_can.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/net/can/rcar_can.txt +1 -1
index 2301331..aede950 100644
@@ -31,7 +31,7 @@ Required properties:
 - pinctrl-0: pin control group to be used for this controller.
 - pinctrl-names: must be "default".
 
-Required properties for R8A7795 and R8A7796:
+Required properties for R8A774A1, R8A774C0, R8A7795, and R8A7796:
 For the denoted SoCs, "clkp2" can be CANFD clock. This is a div6 clock and can
 be used by both CAN and CAN FD controller at the same time. It needs to be
 scaled to maximum frequency if any of these controllers use it. This is done
Signature · 1 line
2.7.4
#3 lore raw

PATCH 3/12 thermal: rcar_thermal: update calculation formula for R-Car Gen3 SoCs

In reply to Lad Prabhakar

From: Yoshihiro Kaneko <[email protected]>

commit 20386f0d84a22214d1f037dedfffb6709dd0117a upstream.

Update calculation for the R-Car Gen3 and RZ/G2 SoCs which have a thermal IP block controlled by this driver. That is the:

* R-Car D3 (r8a77995)
* R-Car E2 (r8a77990)
* R-Car V3M (r8a77970)
* RZ/G2E (r8a774c0)

The calculation update is as documented in the R-Car Gen3 User's Manual, v1.50 Nov 2018:

- When CTEMP is less than 24
T = CTEMP[5:0] * 5.5 - 72
- When CTEMP is equal to/greater than 24
T = CTEMP[5:0] * 5 - 60

This was inspired by a patch in the BSP by Van Do <[email protected]>

---
 drivers/thermal/rcar_thermal.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/thermal/rcar_thermal.c +10 -1
index 5735e36..84baeb2 100644
@@ -52,6 +52,7 @@ struct rcar_thermal_chip {
 	unsigned int irq_per_ch : 1;
 	unsigned int needs_suspend_resume : 1;
 	unsigned int nirqs;
+	unsigned int ctemp_bands;
 };
 
 static const struct rcar_thermal_chip rcar_thermal = {
@@ -60,6 +61,7 @@ static const struct rcar_thermal_chip rcar_thermal = {
 	.irq_per_ch = 0,
 	.needs_suspend_resume = 0,
 	.nirqs = 1,
+	.ctemp_bands = 1,
 };
 
 static const struct rcar_thermal_chip rcar_gen2_thermal = {
@@ -68,6 +70,7 @@ static const struct rcar_thermal_chip rcar_gen2_thermal = {
 	.irq_per_ch = 0,
 	.needs_suspend_resume = 0,
 	.nirqs = 1,
+	.ctemp_bands = 1,
 };
 
 static const struct rcar_thermal_chip rcar_gen3_thermal = {
@@ -80,6 +83,7 @@ static const struct rcar_thermal_chip rcar_gen3_thermal = {
 	 * interrupts to detect a temperature change, rise or fall.
 	 */
 	.nirqs = 2,
+	.ctemp_bands = 2,
 };
 
 struct rcar_thermal_priv {
@@ -255,7 +259,12 @@ static int rcar_thermal_get_current_temp(struct rcar_thermal_priv *priv,
 		return ret;
 
 	mutex_lock(&priv->lock);
-	tmp =  MCELSIUS((priv->ctemp * 5) - 65);
+	if (priv->chip->ctemp_bands == 1)
+		tmp = MCELSIUS((priv->ctemp * 5) - 65);
+	else if (priv->ctemp < 24)
+		tmp = MCELSIUS(((priv->ctemp * 55) - 720) / 10);
+	else
+		tmp = MCELSIUS((priv->ctemp * 5) - 60);
 	mutex_unlock(&priv->lock);
 
 	if ((tmp < MCELSIUS(-45)) || (tmp > MCELSIUS(125))) {
Signature · 1 line
2.7.4
#4 lore raw

PATCH 4/12 arm64: dts: renesas: r8a774c0: Create thermal zone to support IPA

In reply to Lad Prabhakar

From: Biju Das <[email protected]>

commit 8438bfda9d76815707a7823ab91a944eea6d6266 upstream.

Setup a thermal zone driven by SoC temperature sensor. Create passive trip points and bind them to CPUFreq cooling device that supports power extension.

Based on the work done by Dien Pham <[email protected]> and others for r8a77990 SoC.

[fab: changed oder of cpu-thermal children according to order upstream]
---
 arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/renesas/r8a774c0.dtsi +18 -5
index 354d6b9..0c57e15 100644
@@ -73,6 +73,7 @@
 			compatible = "arm,cortex-a53", "arm,armv8";
 			reg = <0>;
 			device_type = "cpu";
+			#cooling-cells = <2>;
 			power-domains = <&sysc R8A774C0_PD_CA53_CPU0>;
 			next-level-cache = <&L2_CA53>;
 			enable-method = "psci";
@@ -1899,18 +1900,30 @@
 	thermal-zones {
 		cpu-thermal {
 			polling-delay-passive = <250>;
-			polling-delay = <1000>;
-			thermal-sensors = <&thermal>;
+			polling-delay = <0>;
+			thermal-sensors = <&thermal 0>;
+			sustainable-power = <717>;
+
+			cooling-maps {
+				map0 {
+					trip = <&target>;
+					cooling-device = <&a53_0 0 2>;
+					contribution = <1024>;
+				};
+			};
 
 			trips {
-				cpu-crit {
+				sensor1_crit: sensor1-crit {
 					temperature = <120000>;
 					hysteresis = <2000>;
 					type = "critical";
 				};
-			};
 
-			cooling-maps {
+				target: trip-point1 {
+					temperature = <100000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
 			};
 		};
 	};
Signature · 1 line
2.7.4
#5 lore raw

PATCH 5/12 arm64: dts: renesas: r8a774c0: Add dynamic power coefficient

In reply to Lad Prabhakar

From: Biju Das <[email protected]>

commit 652fd0f44e98a7fa87be9e97115749e103ccf703 upstream.

Describe the dynamic power coefficient of A53 CPUs.

Based on work by Gaku Inami <[email protected]> and others.

---
 arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/renesas/r8a774c0.dtsi +1 -0
index 0c57e15..1e8b8af 100644
@@ -77,6 +77,7 @@
 			power-domains = <&sysc R8A774C0_PD_CA53_CPU0>;
 			next-level-cache = <&L2_CA53>;
 			enable-method = "psci";
+			dynamic-power-coefficient = <277>;
 			clocks = <&cpg CPG_CORE R8A774C0_CLK_Z2>;
 			operating-points-v2 = <&cluster1_opp>;
 		};
Signature · 1 line
2.7.4
#6 lore raw

PATCH 6/12 arm64: dts: renesas: r8a774c0: Clean up CPU compatibles

In reply to Lad Prabhakar

From: Robin Murphy <[email protected]>

commit 11290c09e29600f45684113d78209d1df1c22aba upstream.

Apparently this DTS crossed over with commit 31af04cd60d3 ("arm64: dts:
Remove inconsistent use of 'arm,armv8' compatible string") and missed out on the cleanup, so put it right.

---
 arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/renesas/r8a774c0.dtsi +2 -2
index 1e8b8af..cb1b71d 100644
@@ -70,7 +70,7 @@
 		#size-cells = <0>;
 
 		a53_0: cpu at 0 {
-			compatible = "arm,cortex-a53", "arm,armv8";
+			compatible = "arm,cortex-a53";
 			reg = <0>;
 			device_type = "cpu";
 			#cooling-cells = <2>;
@@ -83,7 +83,7 @@
 		};
 
 		a53_1: cpu at 1 {
-			compatible = "arm,cortex-a53", "arm,armv8";
+			compatible = "arm,cortex-a53";
 			reg = <1>;
 			device_type = "cpu";
 			power-domains = <&sysc R8A774C0_PD_CA53_CPU1>;
Signature · 1 line
2.7.4
#7 lore raw

PATCH 7/12 arm64: dts: renesas: r8a774c0: Add missing assigned-clocks for CAN[01]

In reply to Lad Prabhakar

From: Fabrizio Castro <[email protected]>

commit e8efd2a8e20a9d7a7bd701950254a0ae04a8ce27 upstream.

Define "assigned-clocks" and "assigned-clock-rates" properties for CAN[01] DT nodes, as required by the dt-bindings.

Fixes 036bc85c1d06ef0a ("arm64: dts: renesas: r8a774c0: Add clkp2 clock to CAN nodes")
---
 arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/renesas/r8a774c0.dtsi +4 -0
index cb1b71d..438844f 100644
@@ -975,6 +975,8 @@
 				 <&cpg CPG_CORE R8A774C0_CLK_CANFD>,
 				 <&can_clk>;
 			clock-names = "clkp1", "clkp2", "can_clk";
+			assigned-clocks = <&cpg CPG_CORE R8A774C0_CLK_CANFD>;
+			assigned-clock-rates = <40000000>;
 			power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
 			resets = <&cpg 916>;
 			status = "disabled";
@@ -989,6 +991,8 @@
 				 <&cpg CPG_CORE R8A774C0_CLK_CANFD>,
 				 <&can_clk>;
 			clock-names = "clkp1", "clkp2", "can_clk";
+			assigned-clocks = <&cpg CPG_CORE R8A774C0_CLK_CANFD>;
+			assigned-clock-rates = <40000000>;
 			power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
 			resets = <&cpg 915>;
 			status = "disabled";
Signature · 1 line
2.7.4
#8 lore raw

PATCH 8/12 arm64: dts: renesas: r8a774c0: Fix register range of display node

In reply to Lad Prabhakar

From: Geert Uytterhoeven <[email protected]>

commit 23ad2b4672a7572e0f091cfe90aac1cd9bdca28a upstream.

Since the R8A774C0 SoC uses DU{0,1} only, the register block length should be 0x40000.

Based on commit 06585ed38b6698bc ("arm64: dts: renesas: r8a77990: Fix register range of display node") for R-Car E3.

Fixes 8ed3a6b223159df3 ("arm64: dts: renesas: r8a774c0: Add display output support")
---
 arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/renesas/r8a774c0.dtsi +1 -1
index 438844f..3f5b659 100644
@@ -1807,7 +1807,7 @@
 
 		du: display at feb00000 {
 			compatible = "renesas,du-r8a774c0";
-			reg = <0 0xfeb00000 0 0x80000>;
+			reg = <0 0xfeb00000 0 0x40000>;
 			interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 724>,
Signature · 1 line
2.7.4
#9 lore raw

PATCH 9/12 arm64: dts: renesas: Update 'vsps' properties for readability

In reply to Lad Prabhakar

From: Jacopo Mondi <[email protected]>

commit 38290431d56d7d3928ac89e9f8d3d6b3c8df4c6e upstream.

Update the 'vsps' property in the R-Car Gen3 SoC device tree files to match what's in the documentation example.

---
 arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 2 +-
 arch/arm64/boot/dts/renesas/r8a7795.dtsi  | 2 +-
 arch/arm64/boot/dts/renesas/r8a77965.dtsi | 2 +-
 arch/arm64/boot/dts/renesas/r8a77995.dtsi | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/renesas/r8a774c0.dtsi +1 -1
index 3f5b659..cf25dbb 100644
@@ -1813,7 +1813,7 @@
 			clocks = <&cpg CPG_MOD 724>,
 				 <&cpg CPG_MOD 723>;
 			clock-names = "du.0", "du.1";
-			vsps = <&vspd0 0 &vspd1 0>;
+			vsps = <&vspd0 0>, <&vspd1 0>;
 			status = "disabled";
 
 			ports {
arch/arm64/boot/dts/renesas/r8a7795.dtsi +1 -1
index c87eed7..b9edb71 100644
@@ -2795,7 +2795,7 @@
 				 <&cpg CPG_MOD 721>,
 				 <&cpg CPG_MOD 727>;
 			clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0";
-			vsps = <&vspd0 0 &vspd1 0 &vspd2 0 &vspd0 1>;
+			vsps = <&vspd0 0>, <&vspd1 0>, <&vspd2 0>, <&vspd0 1>;
 			status = "disabled";
 
 			ports {
arch/arm64/boot/dts/renesas/r8a77965.dtsi +1 -1
index f1dfd174..7de6edf 100644
@@ -1839,7 +1839,7 @@
 			clock-names = "du.0", "du.1", "du.3";
 			status = "disabled";
 
-			vsps = <&vspd0 0 &vspd1 0 &vspd0 1>;
+			vsps = <&vspd0 0>, <&vspd1 0>, <&vspd0 1>;
 
 			ports {
 				#address-cells = <1>;
arch/arm64/boot/dts/renesas/r8a77995.dtsi +1 -1
index fe77bc4..db0c8ad 100644
@@ -944,7 +944,7 @@
 			clocks = <&cpg CPG_MOD 724>,
 				 <&cpg CPG_MOD 723>;
 			clock-names = "du.0", "du.1";
-			vsps = <&vspd0 0 &vspd1 0>;
+			vsps = <&vspd0 0>, <&vspd1 0>;
 			status = "disabled";
 
 			ports {
Signature · 1 line
2.7.4
#10 lore raw

PATCH 10/12 arm64: dts: renesas: r8a774c0: cat874: Add definition for 12V regulator

In reply to Lad Prabhakar

From: Fabrizio Castro <[email protected]>

commit 7fc009cbd7d11d6b27ba5443dbfa80a0513829e4 upstream.

Power rail "D12.0V" comes straight from the power barrel connector, and it's used in both main board and sub board.

---
 arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 9 +++++++++
 1 file changed, 9 insertions(+)
arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts +9 -0
index fdca695..83b39fd 100644
@@ -65,6 +65,15 @@
 		reg = <0x0 0x48000000 0x0 0x78000000>;
 	};
 
+	reg_12p0v: regulator-12p0v {
+		compatible = "regulator-fixed";
+		regulator-name = "D12.0V";
+		regulator-min-microvolt = <12000000>;
+		regulator-max-microvolt = <12000000>;
+		regulator-boot-on;
+		regulator-always-on;
+	};
+
 	sound: sound {
 		compatible = "simple-audio-card";
 
Signature · 1 line
2.7.4
#11 lore raw

PATCH 10/12 arm64: dts: renesas: r8a774c0: cat874: Add definition for 12V regulator

Hi!

Quoted 6 lines

From: Fabrizio Castro <[email protected]>

commit 7fc009cbd7d11d6b27ba5443dbfa80a0513829e4 upstream.

Power rail "D12.0V" comes straight from the power barrel connector, and it's used in both main board and sub board.

Given that line is always on, always constant, and not referenced anywhere, does it need to be described in the dts?

Will it be used in future?

Best regards,
Pavel

Quoted 19 lines
arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts +9 -0
@@ -65,6 +65,15 @@
 		reg = <0x0 0x48000000 0x0 0x78000000>;
 	};
 
+	reg_12p0v: regulator-12p0v {
+		compatible = "regulator-fixed";
+		regulator-name = "D12.0V";
+		regulator-min-microvolt = <12000000>;
+		regulator-max-microvolt = <12000000>;
+		regulator-boot-on;
+		regulator-always-on;
+	};
+
 	sound: sound {
 		compatible = "simple-audio-card";
 
Signature · 1 line
2.7.4
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/20200116/7fc3d9a5/attachment.sig>
#12 lore raw

PATCH 10/12 arm64: dts: renesas: r8a774c0: cat874: Add definition for 12V regulator

Hi Pavel,

Thank you for the review.

Quoted 16 lines

-----Original Message-----
From: Pavel Machek <[email protected]>
Sent: 16 January 2020 15:30
To: Prabhakar Mahadev Lad <[email protected]>
Cc: cip-dev at lists.cip-project.org; Nobuhiro Iwamatsu <[email protected]>; Pavel Machek <[email protected]>; Chris Paterson <[email protected]>
Subject: Re: [PATCH 4.19.y-cip 10/12] arm64: dts: renesas: r8a774c0: cat874:
Add definition for 12V regulator

Hi!

Quoted 4 lines

From: Fabrizio Castro <[email protected]>

commit 7fc009cbd7d11d6b27ba5443dbfa80a0513829e4 upstream.

Quoted 8 lines
Quoted 2 lines

Power rail "D12.0V" comes straight from the power barrel connector, and it's used in both main board and sub board.

Given that line is always on, always constant, and not referenced anywhere, does it need to be described in the dts?

Will it be used in future?

Yes the regulator will be used in future. (we plan to add support for lvds panel, the regulator will be used by the backlight)

Cheers,
--Prabhakar

Quoted 19 lines

Best regards,
Pavel

Quoted 16 lines
arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts +9 -0
@@ -65,6 +65,15 @@
 reg = <0x0 0x48000000 0x0 0x78000000>;
 };
 
+reg_12p0v: regulator-12p0v {
+compatible = "regulator-fixed";
+regulator-name = "D12.0V";
+regulator-min-microvolt = <12000000>;
+regulator-max-microvolt = <12000000>;
+regulator-boot-on;
+regulator-always-on;
+};
+
 sound: sound {
 compatible = "simple-audio-card";
 
Quoted 7 lines
Quoted 3 lines

--
2.7.4

--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

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

#13 lore raw

PATCH 11/12 arm64: dts: renesas: Use ip=on for bootargs

In reply to Lad Prabhakar

From: Magnus Damm <[email protected]>

commit b31b43c92daee8628c60b411452b1b17acdac580 upstream.

Convert bootargs from ip=dhcp to ip=on

[fab: Drop changes to r8a77990-ebisu.dts, r8a77995-draak.dts, and ulcb.dtsi as not applicable]

---
 arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts  | 2 +-
 arch/arm64/boot/dts/renesas/r8a77970-eagle.dts   | 2 +-
 arch/arm64/boot/dts/renesas/salvator-common.dtsi | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts +1 -1
index 83b39fd..160b176 100644
@@ -20,7 +20,7 @@
 	};
 
 	chosen {
-		bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
+		bootargs = "ignore_loglevel rw root=/dev/nfs ip=on";
 		stdout-path = "serial0:115200n8";
 	};
 
arch/arm64/boot/dts/renesas/r8a77970-eagle.dts +1 -1
index b6d5332..233f26f 100644
@@ -19,7 +19,7 @@
 	};
 
 	chosen {
-		bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
+		bootargs = "ignore_loglevel rw root=/dev/nfs ip=on";
 		stdout-path = "serial0:115200n8";
 	};
 
arch/arm64/boot/dts/renesas/salvator-common.dtsi +1 -1
index 3b90f81..99b95d9 100644
@@ -38,7 +38,7 @@
 	};
 
 	chosen {
-		bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
+		bootargs = "ignore_loglevel rw root=/dev/nfs ip=on";
 		stdout-path = "serial0:115200n8";
 	};
 
Signature · 1 line
2.7.4
#14 lore raw

PATCH 12/12 arm64: dts: renesas: r8a774c0: cat874: Sort nodes

In reply to Lad Prabhakar

From: Yoshihiro Kaneko <[email protected]>

commit 63a0f811558b9a5587a8c52978a57a8b528b074a upstream.

Sort nodes.

If node address is present
* Sort by node address, grouping all nodes with the same compat string and sorting the group alphabetically.
Else
* Sort alphabetically

This should not have any run-time effect.

---
 arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 28 ++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)
arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts +14 -14
index 160b176..5be3bad 100644
@@ -82,13 +82,13 @@
 		simple-audio-card,bitclock-master = <&sndcpu>;
 		simple-audio-card,frame-master = <&sndcpu>;
 
-		sndcpu: simple-audio-card,cpu {
-			sound-dai = <&rcar_sound>;
-		};
-
 		sndcodec: simple-audio-card,codec {
 			sound-dai = <&tda19988>;
 		};
+
+		sndcpu: simple-audio-card,cpu {
+			sound-dai = <&rcar_sound>;
+		};
 	};
 
 	vcc_sdhi0: regulator-vcc-sdhi0 {
@@ -255,16 +255,16 @@
 		function = "du";
 	};
 
-	i2c1_pins: i2c1 {
-		groups = "i2c1_b";
-		function = "i2c1";
-	};
-
 	hscif2_pins: hscif2 {
 		groups = "hscif2_data_a", "hscif2_ctrl_a";
 		function = "hscif2";
 	};
 
+	i2c1_pins: i2c1 {
+		groups = "i2c1_b";
+		function = "i2c1";
+	};
+
 	scif2_pins: scif2 {
 		groups = "scif2_data_a";
 		function = "scif2";
@@ -288,15 +288,15 @@
 		power-source = <1800>;
 	};
 
-	sound_pins: sound {
-		groups = "ssi01239_ctrl", "ssi0_data";
-		function = "ssi";
-	};
-
 	sound_clk_pins: sound_clk {
 		groups = "audio_clkout1_a";
 		function = "audio_clk";
 	};
+
+	sound_pins: sound {
+		groups = "ssi01239_ctrl", "ssi0_data";
+		function = "ssi";
+	};
 };
 
 &rcar_sound {
Signature · 1 line
2.7.4
#15 lore raw

cover Renesas RZ/G2E backport IPA support along with minor fixes

In reply to Lad Prabhakar

Hi!

I quickly reviewed the patches, and might have minor comments, but the series look good.

Tests are currently running at

https://gitlab.com/cip-project/cip-kernel/linux-cip/tree/ci/pavel/linux-cip

If there are no objections and tests succeed, I can push the applied series.

Best regards,
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/20200116/e8d16972/attachment.sig>
#16 lore raw

cover Renesas RZ/G2E backport IPA support along with minor fixes

Hi,

Quoted 15 lines

-----Original Message-----
From: Pavel Machek [mailto:pavel at denx.de]
Sent: Friday, January 17, 2020 12:26 AM
To: Lad Prabhakar <[email protected]>
Cc: cip-dev at lists.cip-project.org; iwamatsu nobuhiro(?? ?? ??? ?????) <[email protected]>; Pavel Machek <[email protected]>; Chris Paterson <[email protected]>
Subject: Re: [PATCH 4.19.y-cip 00/12] Renesas RZ/G2E backport IPA support along with minor fixes

Hi!

I quickly reviewed the patches, and might have minor comments, but the series look good.

Quoted 7 lines

Tests are currently running at

https://gitlab.com/cip-project/cip-kernel/linux-cip/tree/ci/pavel/li
nux-cip

If there are no objections and tests succeed, I can push the applied series.

I reviewed this series, I have nothing to point out.

Best regards,
Nobuhiro

#17 lore raw

cover Renesas RZ/G2E backport IPA support along with minor fixes

Hi!

Quoted 5 lines
Quoted 5 lines

I quickly reviewed the patches, and might have minor comments, but the series look good.

Tests are currently running at

Quoted 7 lines
Quoted 5 lines

https://gitlab.com/cip-project/cip-kernel/linux-cip/tree/ci/pavel/li
nux-cip

If there are no objections and tests succeed, I can push the applied series.

I reviewed this series, I have nothing to point out.

Thanks. I pushed the series to kernel.org.
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: 181 bytes
Desc: Digital signature
URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20200120/7144f22b/attachment-0001.sig>