Skip to contentSkip to conversation

ARM: dts: r8a7745,r8a7794: Remove generic compatible strings from iic blocks

PATCH In review Geert Uytterhoeven 3 participants 5 messages May 4, 2021 – May 28, 2021

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

cover ARM: dts: r8a7745,r8a7794: Remove generic compatible strings from iic blocks

Hi all,

This patch series fixes the first issues discovered by[1], and removes the generic compatible strings from the IIC blocks on the R-Car E2 and RZ/G1E SoCs, as they do not have the automatic transmission registers. More follow-up patches are expected, when IIC will have dislosed all of its secrets...

Thanks for your comments!

[1] "[PATCH/RFC 4/6] dt-bindings: i2c: renesas,iic: Convert to json-schema"

    lore.kernel.org/r/ecfaf6be5e8c285db2bcc823bb1dd89931fa5c29.1620138454.git.geert+renesas@glider.be

Geert Uytterhoeven (2):
ARM: dts: r8a7745: Remove generic compatible strings from iic blocks
ARM: dts: r8a7794: Remove generic compatible strings from iic blocks

 arch/arm/boot/dts/r8a7745.dtsi | 8 ++------
 arch/arm/boot/dts/r8a7794.dtsi | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)
Signature · 12 lines
2.25.1

Gr{oetje,eeting}s,

						Geert

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

PATCH 1/2 ARM: dts: r8a7745: Remove generic compatible strings from iic blocks

The IIC blocks on RZ/G1E do not have the automatic transmission registers. Hence they thus must not declare compatibility with the R-Car Gen2-specific and generic versions.

Fixes 0ee0aff583ddb6e9 ("ARM: dts: r8a7745: Add IIC cores to dtsi")
---
 arch/arm/boot/dts/r8a7745.dtsi | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
arch/arm/boot/dts/r8a7745.dtsi +2 -6
index 36892ea87d7df941..0756197258de4a4b 100644
@@ -475,9 +475,7 @@ i2c5: i2c@e6528000 {
 		iic0: i2c@e6500000 {
 			#address-cells = <1>;
 			#size-cells = <0>;
-			compatible = "renesas,iic-r8a7745",
-				     "renesas,rcar-gen2-iic",
-				     "renesas,rmobile-iic";
+			compatible = "renesas,iic-r8a7745";
 			reg = <0 0xe6500000 0 0x425>;
 			interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 318>;
@@ -492,9 +490,7 @@ iic0: i2c@e6500000 {
 		iic1: i2c@e6510000 {
 			#address-cells = <1>;
 			#size-cells = <0>;
-			compatible = "renesas,iic-r8a7745",
-				     "renesas,rcar-gen2-iic",
-				     "renesas,rmobile-iic";
+			compatible = "renesas,iic-r8a7745";
 			reg = <0 0xe6510000 0 0x425>;
 			interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 323>;
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/2 ARM: dts: r8a7794: Remove generic compatible strings from iic blocks

In reply to Geert Uytterhoeven

The IIC blocks on R-Car E2 do not have the automatic transmission registers. Hence they thus must not declare compatibility with the R-Car Gen2-specific and generic versions.

Fixes aa9b992ea2d3c2cc ("ARM: dts: r8a7794: Add IIC nodes")
---
 arch/arm/boot/dts/r8a7794.dtsi | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
arch/arm/boot/dts/r8a7794.dtsi +2 -6
index 0035770e74de80a5..f974b8676bc59222 100644
@@ -457,9 +457,7 @@ i2c5: i2c@e6528000 {
 		};
 
 		i2c6: i2c@e6500000 {
-			compatible = "renesas,iic-r8a7794",
-				     "renesas,rcar-gen2-iic",
-				     "renesas,rmobile-iic";
+			compatible = "renesas,iic-r8a7794";
 			reg = <0 0xe6500000 0 0x425>;
 			interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 318>;
@@ -474,9 +472,7 @@ i2c6: i2c@e6500000 {
 		};
 
 		i2c7: i2c@e6510000 {
-			compatible = "renesas,iic-r8a7794",
-				     "renesas,rcar-gen2-iic",
-				     "renesas,rmobile-iic";
+			compatible = "renesas,iic-r8a7794";
 			reg = <0 0xe6510000 0 0x425>;
 			interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 323>;
Signature · 1 line
2.25.1
#3 lore raw
In reply to Geert Uytterhoeven
Quoted 9 lines · Geert Uytterhoeven

This patch series fixes the first issues discovered by[1], and removes the generic compatible strings from the IIC blocks on the R-Car E2 and RZ/G1E SoCs, as they do not have the automatic transmission registers. More follow-up patches are expected, when IIC will have dislosed all of its secrets...

Thanks for your comments!

[1] "[PATCH/RFC 4/6] dt-bindings: i2c: renesas,iic: Convert to json-schema"

Quoted 8 lines
    lore.kernel.org/r/ecfaf6be5e8c285db2bcc823bb1dd89931fa5c29.1620138454.git.geert+renesas@glider.be

Geert Uytterhoeven (2):
ARM: dts: r8a7745: Remove generic compatible strings from iic blocks
ARM: dts: r8a7794: Remove generic compatible strings from iic blocks

 arch/arm/boot/dts/r8a7745.dtsi | 8 ++------
 arch/arm/boot/dts/r8a7794.dtsi | 8 ++------

While drivers/i2c/busses/i2c-sh_mobile.c already has a match entry for "renesas,iic-r8a7794", it does not have one for "renesas,iic-r8a7745" yet. Hence patch 2/2 depends on a to-be-sent patch to update the driver.

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
#4 lore raw
Quoted 5 lines

While drivers/i2c/busses/i2c-sh_mobile.c already has a match entry for "renesas,iic-r8a7794", it does not have one for "renesas,iic-r8a7745" yet. Hence patch 2/2 depends on a to-be-sent patch to update the driver.

For the record, this patch was never sent because we are still investigating the presence of those registers in IIC revisions.