Skip to contentSkip to conversation

arm: dts: renesas: r8a77980: Remove r8a77970 DU compatible

PATCH In review Kieran Bingham 9 participants 12 messages Sep 12, 2019 – Feb 21, 2020

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

PATCH 1/1 arm: dts: renesas: r8a77980: Remove r8a77970 DU compatible

The r8a77970 was added with an compatible string for a differnet device rather than adding the correct compatible to the driver.

Remove the unnecessary compatible which is for a different platform.

---
Please note, this patch should not be integrated until the renesas,du-r8a77980 compatible string makes it into the DU [0].

[0] https://lore.kernel.org/linux-renesas-soc/[email protected]/T/#t

 arch/arm64/boot/dts/renesas/r8a77980.dtsi | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm64/boot/dts/renesas/r8a77980.dtsi +1 -2
index 042f4089e546..c6195377d181 100644
@@ -1487,8 +1487,7 @@
 		};
 
 		du: display@feb00000 {
-			compatible = "renesas,du-r8a77980",
-				     "renesas,du-r8a77970";
+			compatible = "renesas,du-r8a77980";
 			reg = <0 0xfeb00000 0 0x80000>;
 			interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 724>;
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 1 line · Kieran Bingham

The r8a77970 was added with an compatible string for a differnet device

different

Quoted 5 lines

rather than adding the correct compatible to the driver.

Remove the unnecessary compatible which is for a different platform.

Quoted 2 lines

Please note, this patch should not be integrated until the renesas,du-r8a77980 compatible string makes it into the DU [0].

Hence postponed.

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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
#2 lore raw

Hi Geert,

Quoted 5 lines · Geert Uytterhoeven
Quoted 1 line · Kieran Bingham

The r8a77970 was added with an compatible string for a differnet device

different

Also s/an/a/ ... Perhaps I should just step away from the keyboard today, I can't seem to type ! hehe

Quoted 4 lines
Quoted 4 lines

rather than adding the correct compatible to the driver.

Remove the unnecessary compatible which is for a different platform.

Quoted 8 lines
Quoted 1 line
Quoted 2 lines

Please note, this patch should not be integrated until the renesas,du-r8a77980 compatible string makes it into the DU [0].

Hence postponed.

Thanks.
--
KB

Quoted 4 lines

Gr{oetje,eeting}s,

Geert

#3 lore raw

Hi Kieran,

Quoted 9 lines · Kieran Bingham
Quoted 5 lines · Geert Uytterhoeven
Quoted 1 line · Kieran Bingham

The r8a77970 was added with an compatible string for a differnet device

different

Also s/an/a/ ... Perhaps I should just step away from the keyboard today, I can't seem to type ! hehe

Doh, finding a first typo increased my adrenaline level, masking the ability to see a second ;-)

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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
Reviewed-by on v1 1/1
#4 lore raw
In reply to Kieran Bingham
Quoted 6 lines · Kieran Bingham

The r8a77970 was added with an compatible string for a differnet device rather than adding the correct compatible to the driver.

Remove the unnecessary compatible which is for a different platform.

Quoted 26 lines

---
Please note, this patch should not be integrated until the renesas,du-r8a77980 compatible string makes it into the DU [0].

[0] https://lore.kernel.org/linux-renesas-soc/[email protected]/T/#t

 arch/arm64/boot/dts/renesas/r8a77980.dtsi | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm64/boot/dts/renesas/r8a77980.dtsi +1 -2
index 042f4089e546..c6195377d181 100644
@@ -1487,8 +1487,7 @@
 		};
 
 		du: display@feb00000 {
-			compatible = "renesas,du-r8a77980",
-				     "renesas,du-r8a77970";
+			compatible = "renesas,du-r8a77980";
 			reg = <0 0xfeb00000 0 0x80000>;
 			interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 724>;
Signature · 1 line
2.20.1
#5 lore raw

PATCH 1/1 ARM: dts: renesas: Group tuples in operating-points properties

To improve human readability and enable automatic validation, the tuples in the "operating-points" properties of CPU nodes should be grouped.

Fix this by grouping the tuples of these properties using angle brackets in the DTS files for all Renesas SoCs that don't already do so.

---
 arch/arm/boot/dts/r8a73a4-ape6evm.dts | 7 ++-----
 arch/arm/boot/dts/sh73a0-kzm9g.dts    | 9 +++------
 2 files changed, 5 insertions(+), 11 deletions(-)
arch/arm/boot/dts/r8a73a4-ape6evm.dts +2 -5
index 1fbf45082726af36..9eea57d069c227a7 100644
@@ -238,11 +238,8 @@
 
 &cpu0 {
 	cpu0-supply = <&vdd_dvfs>;
-	operating-points = <
-		/* kHz  uV */
-		1950000 1115000
-		1462500  995000
-	>;
+	operating-points = <1950000 1115000>,	/* kHz  uV */
+			   <1462500  995000>;
 	voltage-tolerance = <1>; /* 1% */
 };
 
arch/arm/boot/dts/sh73a0-kzm9g.dts +3 -6
index 5fa9d3d9cd36a146..1c9dfe9f10e552da 100644
@@ -25,12 +25,9 @@
 	cpus {
 		cpu@0 {
 			cpu0-supply = <&vdd_dvfs>;
-			operating-points = <
-				/* kHz  uV */
-				1196000 1315000
-				 598000 1175000
-				 398667 1065000
-			>;
+			operating-points = <1196000 1315000>,	/* kHz  uV */
+					   < 598000 1175000>,
+					   < 398667 1065000>;
 			voltage-tolerance = <1>; /* 1% */
 		};
 	};
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#6 lore raw

Re: [PATCH] ARM: dts: renesas: Group tuples in operating-points properties

Hi Geert,

Thanks for your work.

Quoted 7 lines · Geert Uytterhoeven

To improve human readability and enable automatic validation, the tuples in the "operating-points" properties of CPU nodes should be grouped.

Fix this by grouping the tuples of these properties using angle brackets in the DTS files for all Renesas SoCs that don't already do so.

Quoted 46 lines
---
 arch/arm/boot/dts/r8a73a4-ape6evm.dts | 7 ++-----
 arch/arm/boot/dts/sh73a0-kzm9g.dts    | 9 +++------
 2 files changed, 5 insertions(+), 11 deletions(-)
arch/arm/boot/dts/r8a73a4-ape6evm.dts +2 -5
index 1fbf45082726af36..9eea57d069c227a7 100644
@@ -238,11 +238,8 @@
 
 &cpu0 {
 	cpu0-supply = <&vdd_dvfs>;
-	operating-points = <
-		/* kHz  uV */
-		1950000 1115000
-		1462500  995000
-	>;
+	operating-points = <1950000 1115000>,	/* kHz  uV */
+			   <1462500  995000>;
 	voltage-tolerance = <1>; /* 1% */
 };
 
arch/arm/boot/dts/sh73a0-kzm9g.dts +3 -6
index 5fa9d3d9cd36a146..1c9dfe9f10e552da 100644
@@ -25,12 +25,9 @@
 	cpus {
 		cpu@0 {
 			cpu0-supply = <&vdd_dvfs>;
-			operating-points = <
-				/* kHz  uV */
-				1196000 1315000
-				 598000 1175000
-				 398667 1065000
-			>;
+			operating-points = <1196000 1315000>,	/* kHz  uV */
+					   < 598000 1175000>,
+					   < 398667 1065000>;
 			voltage-tolerance = <1>; /* 1% */
 		};
 	};
Signature · 1 line
2.17.1
Signature · 2 lines
Regards,
Niklas Söderlund
#7 lore raw

PATCH v2 1/1 ARM: dts: renesas: Add missing ethernet PHY reset GPIO on Gen2 reference boards

From: Marek Vasut <[email protected]>

The ethernet PHY reset GPIO was missing and the kernel was depending solely on the bootloader to bring the PHY out of reset. Fix this to get rid of the dependency on bootloader.

Cc Geert Uytterhoeven <[email protected]>
Cc Wolfram Sang <[email protected]>

To: [email protected]

---
V2: - Move the reset-gpios at the end of the list of nodes
- Add TB/RB

---
 arch/arm/boot/dts/r8a7790-lager.dts   | 1 +
 arch/arm/boot/dts/r8a7790-stout.dts   | 1 +
 arch/arm/boot/dts/r8a7791-koelsch.dts | 1 +
 arch/arm/boot/dts/r8a7791-porter.dts  | 1 +
 arch/arm/boot/dts/r8a7793-gose.dts    | 1 +
 arch/arm/boot/dts/r8a7794-alt.dts     | 1 +
 arch/arm/boot/dts/r8a7794-silk.dts    | 1 +
 7 files changed, 7 insertions(+)
arch/arm/boot/dts/r8a7790-lager.dts +1 -0
index 097fd9317c6e..69745def44d4 100644
@@ -674,6 +674,7 @@ phy1: ethernet-phy@1 {
 		interrupt-parent = <&irqc0>;
 		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
 		micrel,led-mode = <1>;
+		reset-gpios = <&gpio5 31 GPIO_ACTIVE_LOW>;
 	};
 };
 
arch/arm/boot/dts/r8a7790-stout.dts +1 -0
index a315ba749aa4..4138efb2766d 100644
@@ -203,6 +203,7 @@ phy1: ethernet-phy@1 {
 		interrupt-parent = <&irqc0>;
 		interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
 		micrel,led-mode = <1>;
+		reset-gpios = <&gpio3 31 GPIO_ACTIVE_LOW>;
 	};
 };
 
arch/arm/boot/dts/r8a7791-koelsch.dts +1 -0
index 2b096d5e06fb..687167b70cb6 100644
@@ -633,6 +633,7 @@ phy1: ethernet-phy@1 {
 		interrupt-parent = <&irqc0>;
 		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
 		micrel,led-mode = <1>;
+		reset-gpios = <&gpio5 22 GPIO_ACTIVE_LOW>;
 	};
 };
 
arch/arm/boot/dts/r8a7791-porter.dts +1 -0
index f9ece7ab2010..a8e0335148a5 100644
@@ -307,6 +307,7 @@ phy1: ethernet-phy@1 {
 		interrupt-parent = <&irqc0>;
 		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
 		micrel,led-mode = <1>;
+		reset-gpios = <&gpio5 22 GPIO_ACTIVE_LOW>;
 	};
 };
 
arch/arm/boot/dts/r8a7793-gose.dts +1 -0
index 22ca7cd1e7d2..cfe06a74ce89 100644
@@ -591,6 +591,7 @@ phy1: ethernet-phy@1 {
 		interrupt-parent = <&irqc0>;
 		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
 		micrel,led-mode = <1>;
+		reset-gpios = <&gpio5 22 GPIO_ACTIVE_LOW>;
 	};
 };
 
arch/arm/boot/dts/r8a7794-alt.dts +1 -0
index f79fce74cd9c..935935c1dbac 100644
@@ -343,6 +343,7 @@ phy1: ethernet-phy@1 {
 		interrupt-parent = <&irqc0>;
 		interrupts = <8 IRQ_TYPE_LEVEL_LOW>;
 		micrel,led-mode = <1>;
+		reset-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
 	};
 };
 
arch/arm/boot/dts/r8a7794-silk.dts +1 -0
index 2c16ad854300..9aaa96ea9943 100644
@@ -394,6 +394,7 @@ phy1: ethernet-phy@1 {
 		interrupt-parent = <&irqc0>;
 		interrupts = <8 IRQ_TYPE_LEVEL_LOW>;
 		micrel,led-mode = <1>;
+		reset-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
 	};
 };
 
Signature · 1 line
2.24.1
#8 lore raw

Patchwork summary for: linux-renesas-soc

The following patches were marked "accepted", because they were applied to geert/renesas-devel (refs/heads/next):

Hello:

The following patches were marked "accepted", because they were applied to geert/renesas-devel (refs/heads/next):

Patch: arm64: dts: renesas: rcar-gen3: Add CCREE nodes
Submitter: Geert Uytterhoeven <[email protected]>
Patchwork: https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=232961

Patch: arm: dts: renesas: r8a77980: Remove r8a77970 DU compatible
Submitter: Kieran Bingham <[email protected]>
Patchwork: https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=173315

Patch: ARM: dts: renesas: Group tuples in operating-points properties
Submitter: Geert Uytterhoeven <[email protected]>
Patchwork: https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=222603

Patch: [v2] ARM: dts: r7s72100: Add SPIBSC clocks
Submitter: Chris Brandt <[email protected]>
Patchwork: https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=239115

Patch: [V2] ARM: dts: renesas: Add missing ethernet PHY reset GPIO on Gen2 reference boards
Submitter: Marek Vasut <[email protected]>
Patchwork: https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=228335

Total patches: 5

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/pwbot
#9 lore raw

PATCH 1/1 arm64: dts: renesas: rcar-gen3: Add CCREE nodes

Add device nodes for the CryptoCell instances on the various Renesas R-Car Gen3 SoCs that do not have support for them yet in their device trees (M3-W, M3-W+, M3-N, E3, D3).

The R-Car H3 device tree already supports this device.

---
Tested on:
- Salvator-X with R-Car M3-W ES1.0,
- Salvator-XS with R-Car M3-W+ ES3.0,
- Salvator-XS with R-Car M3-N ES1.0,
- Ebisu-4D with R-Car E3 ES1.0,
- Draak with R-Car D3 ES1.0.

$ grep selftest /proc/crypto | sort | uniq -c
    116 selftest     : passed
---
 arch/arm64/boot/dts/renesas/r8a77960.dtsi | 9 +++++++++
 arch/arm64/boot/dts/renesas/r8a77961.dtsi | 9 +++++++++
 arch/arm64/boot/dts/renesas/r8a77965.dtsi | 9 +++++++++
 arch/arm64/boot/dts/renesas/r8a77990.dtsi | 9 +++++++++
 arch/arm64/boot/dts/renesas/r8a77995.dtsi | 9 +++++++++
 5 files changed, 45 insertions(+)
arch/arm64/boot/dts/renesas/r8a77960.dtsi +9 -0
index 988b83fe62d485eb..ea03b91bdf9d9cbc 100644
@@ -862,6 +862,15 @@
 			status = "disabled";
 		};
 
+		arm_cc630p: crypto@e6601000 {
+			compatible = "arm,cryptocell-630p-ree";
+			interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
+			reg = <0x0 0xe6601000 0 0x1000>;
+			clocks = <&cpg CPG_MOD 229>;
+			resets = <&cpg 229>;
+			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+		};
+
 		dmac0: dma-controller@e6700000 {
 			compatible = "renesas,dmac-r8a7796",
 				     "renesas,rcar-dmac";
arch/arm64/boot/dts/renesas/r8a77961.dtsi +9 -0
index be3824bda632233e..b6915319a61c8bf0 100644
@@ -629,6 +629,15 @@
 			/* placeholder */
 		};
 
+		arm_cc630p: crypto@e6601000 {
+			compatible = "arm,cryptocell-630p-ree";
+			interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
+			reg = <0x0 0xe6601000 0 0x1000>;
+			clocks = <&cpg CPG_MOD 229>;
+			resets = <&cpg 229>;
+			power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
+		};
+
 		dmac0: dma-controller@e6700000 {
 			compatible = "renesas,dmac-r8a77961",
 				     "renesas,rcar-dmac";
arch/arm64/boot/dts/renesas/r8a77965.dtsi +9 -0
index 7d2b283b7f556b1d..1a20ebe9ea5be5da 100644
@@ -717,6 +717,15 @@
 			status = "disabled";
 		};
 
+		arm_cc630p: crypto@e6601000 {
+			compatible = "arm,cryptocell-630p-ree";
+			interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
+			reg = <0x0 0xe6601000 0 0x1000>;
+			clocks = <&cpg CPG_MOD 229>;
+			resets = <&cpg 229>;
+			power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
+		};
+
 		dmac0: dma-controller@e6700000 {
 			compatible = "renesas,dmac-r8a77965",
 				     "renesas,rcar-dmac";
arch/arm64/boot/dts/renesas/r8a77990.dtsi +9 -0
index 80e8ef3007c5b646..c05ee98043b2c7a5 100644
@@ -667,6 +667,15 @@
 			dma-channels = <2>;
 		};
 
+		arm_cc630p: crypto@e6601000 {
+			compatible = "arm,cryptocell-630p-ree";
+			interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
+			reg = <0x0 0xe6601000 0 0x1000>;
+			clocks = <&cpg CPG_MOD 229>;
+			resets = <&cpg 229>;
+			power-domains = <&sysc R8A77990_PD_ALWAYS_ON>;
+		};
+
 		dmac0: dma-controller@e6700000 {
 			compatible = "renesas,dmac-r8a77990",
 				     "renesas,rcar-dmac";
arch/arm64/boot/dts/renesas/r8a77995.dtsi +9 -0
index 2b5c39bd86856579..7d3102dccac96e42 100644
@@ -389,6 +389,15 @@
 			dma-channels = <2>;
 		};
 
+		arm_cc630p: crypto@e6601000 {
+			compatible = "arm,cryptocell-630p-ree";
+			interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
+			reg = <0x0 0xe6601000 0 0x1000>;
+			clocks = <&cpg CPG_MOD 229>;
+			resets = <&cpg 229>;
+			power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+		};
+
 		canfd: can@e66c0000 {
 			compatible = "renesas,r8a77995-canfd",
 				     "renesas,rcar-gen3-canfd";
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#10 lore raw

RE: [PATCH] arm64: dts: renesas: rcar-gen3: Add CCREE nodes

Hi Geert-san,

Quoted 9 lines

From: Geert Uytterhoeven, Sent: Friday, January 24, 2020 10:34 PM

Add device nodes for the CryptoCell instances on the various Renesas R-Car Gen3 SoCs that do not have support for them yet in their device trees (M3-W, M3-W+, M3-N, E3, D3).

The R-Car H3 device tree already supports this device.

Thank you for the patch!

Best regards,
Yoshihiro Shimoda

#11 lore raw

PATCH v2 1/1 ARM: dts: r7s72100: Add SPIBSC clocks

Add clocks for SPIBSC blocks.

Also modify the flash node for the GR-PEACH board at the same time because now that the SPIBSC clock is identified, if it is not used by any driver, it will be turned off at the end of kernel boot. That would not work out so well for an XIP system such as GR-PEACH.

---
v2:
- Modified flash node for GR-PEACH board

---
 arch/arm/boot/dts/r7s72100-gr-peach.dts | 3 +++
 arch/arm/boot/dts/r7s72100.dtsi         | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)
arch/arm/boot/dts/r7s72100-gr-peach.dts +3 -0
index fe1a4aa4d7cb..2562cc9b5356 100644
@@ -41,6 +41,9 @@ flash@18000000 {
 		bank-width = <4>;
 		device-width = <1>;
 
+		clocks = <&mstp9_clks R7S72100_CLK_SPIBSC0>;
+		power-domains = <&cpg_clocks>;
+
 		#address-cells = <1>;
 		#size-cells = <1>;
 
arch/arm/boot/dts/r7s72100.dtsi +3 -2
index 75b2796ebfca..0a567d8ebc66 100644
@@ -467,11 +467,12 @@ mstp9_clks: mstp9_clks@fcfe0438 {
 			#clock-cells = <1>;
 			compatible = "renesas,r7s72100-mstp-clocks", "renesas,cpg-mstp-clocks";
 			reg = <0xfcfe0438 4>;
-			clocks = <&p0_clk>, <&p0_clk>, <&p0_clk>, <&p0_clk>;
+			clocks = <&p0_clk>, <&p0_clk>, <&p0_clk>, <&p0_clk>, <&b_clk>, <&b_clk>;
 			clock-indices = <
 				R7S72100_CLK_I2C0 R7S72100_CLK_I2C1 R7S72100_CLK_I2C2 R7S72100_CLK_I2C3
+				R7S72100_CLK_SPIBSC0 R7S72100_CLK_SPIBSC1
 			>;
-			clock-output-names = "i2c0", "i2c1", "i2c2", "i2c3";
+			clock-output-names = "i2c0", "i2c1", "i2c2", "i2c3", "spibsc0", "spibsc1";
 		};
 
 		mstp10_clks: mstp10_clks@fcfe043c {
Signature · 1 line
2.24.1