From: Geert Uytterhoeven <[email protected]>
[ Upstream commit a1721bbbdb5c6687d157f8b8714bba837f6028ac ]
Despite the name, R-Car V3U is the first member of the R-Car Gen4
family. Hence update the compatible properties in various device nodes
to include family-specific compatible values for R-Car Gen4 instead of
R-Car Gen3:
- DMAC,
- (H)SCIF,
- I2C,
- IPMMU,
- WDT.
Signed-off-by: Geert Uytterhoeven <[email protected]>
Reviewed-by: Wolfram Sang <[email protected]>
Link: https://lore.kernel.org/r/73cea9d5e1a6639422c67e4df4285042e31c9fd5.1651497071.git.geert+renesas@glider.be
Stable-dep-of: 0c51912331f8 ("arm64: dts: renesas: r8a779a0: Correct avb[01] reg sizes")
Signed-off-by: Sasha Levin <[email protected]>
---
arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 24 +++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a779a0.dtsi b/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
index 26899fb768a73..c7d1b79692c11 100644
--- a/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
@@ -583,7 +583,7 @@ hscif3: serial@e66a0000 {
avb0: ethernet@e6800000 {
compatible = "renesas,etheravb-r8a779a0",
- "renesas,etheravb-rcar-gen3";
+ "renesas,etheravb-rcar-gen4";
reg = <0 0xe6800000 0 0x800>;
interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 257 IRQ_TYPE_LEVEL_HIGH>,
@@ -631,7 +631,7 @@ avb0: ethernet@e6800000 {
avb1: ethernet@e6810000 {
compatible = "renesas,etheravb-r8a779a0",
- "renesas,etheravb-rcar-gen3";
+ "renesas,etheravb-rcar-gen4";
reg = <0 0xe6810000 0 0x800>;
interrupts = <GIC_SPI 281 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH>,
@@ -679,7 +679,7 @@ avb1: ethernet@e6810000 {
avb2: ethernet@e6820000 {
compatible = "renesas,etheravb-r8a779a0",
- "renesas,etheravb-rcar-gen3";
+ "renesas,etheravb-rcar-gen4";
reg = <0 0xe6820000 0 0x1000>;
interrupts = <GIC_SPI 306 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>,
@@ -727,7 +727,7 @@ avb2: ethernet@e6820000 {
avb3: ethernet@e6830000 {
compatible = "renesas,etheravb-r8a779a0",
- "renesas,etheravb-rcar-gen3";
+ "renesas,etheravb-rcar-gen4";
reg = <0 0xe6830000 0 0x1000>;
interrupts = <GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>,
@@ -775,7 +775,7 @@ avb3: ethernet@e6830000 {
avb4: ethernet@e6840000 {
compatible = "renesas,etheravb-r8a779a0",
- "renesas,etheravb-rcar-gen3";
+ "renesas,etheravb-rcar-gen4";
reg = <0 0xe6840000 0 0x1000>;
interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>,
@@ -823,7 +823,7 @@ avb4: ethernet@e6840000 {
avb5: ethernet@e6850000 {
compatible = "renesas,etheravb-r8a779a0",
- "renesas,etheravb-rcar-gen3";
+ "renesas,etheravb-rcar-gen4";
reg = <0 0xe6850000 0 0x1000>;
interrupts = <GIC_SPI 381 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 382 IRQ_TYPE_LEVEL_HIGH>,
@@ -935,7 +935,7 @@ scif4: serial@e6c40000 {
msiof0: spi@e6e90000 {
compatible = "renesas,msiof-r8a779a0",
- "renesas,rcar-gen3-msiof";
+ "renesas,rcar-gen4-msiof";
reg = <0 0xe6e90000 0 0x0064>;
interrupts = <GIC_SPI 245 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 618>;
@@ -950,7 +950,7 @@ msiof0: spi@e6e90000 {
msiof1: spi@e6ea0000 {
compatible = "renesas,msiof-r8a779a0",
- "renesas,rcar-gen3-msiof";
+ "renesas,rcar-gen4-msiof";
reg = <0 0xe6ea0000 0 0x0064>;
interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 619>;
@@ -965,7 +965,7 @@ msiof1: spi@e6ea0000 {
msiof2: spi@e6c00000 {
compatible = "renesas,msiof-r8a779a0",
- "renesas,rcar-gen3-msiof";
+ "renesas,rcar-gen4-msiof";
reg = <0 0xe6c00000 0 0x0064>;
interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 620>;
@@ -980,7 +980,7 @@ msiof2: spi@e6c00000 {
msiof3: spi@e6c10000 {
compatible = "renesas,msiof-r8a779a0",
- "renesas,rcar-gen3-msiof";
+ "renesas,rcar-gen4-msiof";
reg = <0 0xe6c10000 0 0x0064>;
interrupts = <GIC_SPI 248 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 621>;
@@ -995,7 +995,7 @@ msiof3: spi@e6c10000 {
msiof4: spi@e6c20000 {
compatible = "renesas,msiof-r8a779a0",
- "renesas,rcar-gen3-msiof";
+ "renesas,rcar-gen4-msiof";
reg = <0 0xe6c20000 0 0x0064>;
interrupts = <GIC_SPI 249 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 622>;
@@ -1010,7 +1010,7 @@ msiof4: spi@e6c20000 {
msiof5: spi@e6c28000 {
compatible = "renesas,msiof-r8a779a0",
- "renesas,rcar-gen3-msiof";
+ "renesas,rcar-gen4-msiof";
reg = <0 0xe6c28000 0 0x0064>;
interrupts = <GIC_SPI 250 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 623>;
--
2.43.0
Hi Sasha,
On Mon, Mar 25, 2024 at 12:36 AM Sasha Levin <[email protected]> wrote:
> From: Geert Uytterhoeven <[email protected]>
>
> [ Upstream commit a1721bbbdb5c6687d157f8b8714bba837f6028ac ]
>
> Despite the name, R-Car V3U is the first member of the R-Car Gen4
> family. Hence update the compatible properties in various device nodes
> to include family-specific compatible values for R-Car Gen4 instead of
> R-Car Gen3:
> - DMAC,
> - (H)SCIF,
> - I2C,
> - IPMMU,
> - WDT.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> Reviewed-by: Wolfram Sang <[email protected]>
> Link: https://lore.kernel.org/r/73cea9d5e1a6639422c67e4df4285042e31c9fd5.1651497071.git.geert+renesas@glider.be
> Stable-dep-of: 0c51912331f8 ("arm64: dts: renesas: r8a779a0: Correct avb[01] reg sizes")
> Signed-off-by: Sasha Levin <[email protected]>
> ---
> arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 24 +++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/renesas/r8a779a0.dtsi b/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
> index 26899fb768a73..c7d1b79692c11 100644
> --- a/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
> +++ b/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
> @@ -583,7 +583,7 @@ hscif3: serial@e66a0000 {
>
> avb0: ethernet@e6800000 {
> compatible = "renesas,etheravb-r8a779a0",
> - "renesas,etheravb-rcar-gen3";
> + "renesas,etheravb-rcar-gen4";
This change will break Ethernet, as the Renesas EtherAVB driver in
v5.15.x does not handle "renesas,etheravb-rcar-gen4" yet.
That can be fixed by also backporting commit 949f252a8594a860
("net: ravb: Add R-Car Gen4 support") in v6.1.
> reg = <0 0xe6800000 0 0x800>;
> interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 257 IRQ_TYPE_LEVEL_HIGH>,
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68korg
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
On Mon, Mar 25, 2024 at 09:43:31AM +0100, Geert Uytterhoeven wrote:
>Hi Sasha,
>
>On Mon, Mar 25, 2024 at 12:36 AM Sasha Levin <[email protected]> wrote:
>> From: Geert Uytterhoeven <[email protected]>
>>
>> [ Upstream commit a1721bbbdb5c6687d157f8b8714bba837f6028ac ]
>>
>> Despite the name, R-Car V3U is the first member of the R-Car Gen4
>> family. Hence update the compatible properties in various device nodes
>> to include family-specific compatible values for R-Car Gen4 instead of
>> R-Car Gen3:
>> - DMAC,
>> - (H)SCIF,
>> - I2C,
>> - IPMMU,
>> - WDT.
>>
>> Signed-off-by: Geert Uytterhoeven <[email protected]>
>> Reviewed-by: Wolfram Sang <[email protected]>
>> Link: https://lore.kernel.org/r/73cea9d5e1a6639422c67e4df4285042e31c9fd5.1651497071.git.geert+renesas@glider.be
>> Stable-dep-of: 0c51912331f8 ("arm64: dts: renesas: r8a779a0: Correct avb[01] reg sizes")
>> Signed-off-by: Sasha Levin <[email protected]>
>> ---
>> arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 24 +++++++++++------------
>> 1 file changed, 12 insertions(+), 12 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/renesas/r8a779a0.dtsi b/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
>> index 26899fb768a73..c7d1b79692c11 100644
>> --- a/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
>> +++ b/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
>> @@ -583,7 +583,7 @@ hscif3: serial@e66a0000 {
>>
>> avb0: ethernet@e6800000 {
>> compatible = "renesas,etheravb-r8a779a0",
>> - "renesas,etheravb-rcar-gen3";
>> + "renesas,etheravb-rcar-gen4";
>
>This change will break Ethernet, as the Renesas EtherAVB driver in
>v5.15.x does not handle "renesas,etheravb-rcar-gen4" yet.
>
>That can be fixed by also backporting commit 949f252a8594a860
>("net: ravb: Add R-Car Gen4 support") in v6.1.
I'll just drop this patch instead, thanks!
--
Thanks,
Sasha
Hi Sasha,
On Tue, Mar 26, 2024 at 8:18 PM Sasha Levin <[email protected]> wrote:
> On Mon, Mar 25, 2024 at 09:43:31AM +0100, Geert Uytterhoeven wrote:
> >On Mon, Mar 25, 2024 at 12:36 AM Sasha Levin <[email protected]> wrote:
> >> From: Geert Uytterhoeven <[email protected]>
> >>
> >> [ Upstream commit a1721bbbdb5c6687d157f8b8714bba837f6028ac ]
> >>
> >> Despite the name, R-Car V3U is the first member of the R-Car Gen4
> >> family. Hence update the compatible properties in various device nodes
> >> to include family-specific compatible values for R-Car Gen4 instead of
> >> R-Car Gen3:
> >> - DMAC,
> >> - (H)SCIF,
> >> - I2C,
> >> - IPMMU,
> >> - WDT.
> >>
> >> Signed-off-by: Geert Uytterhoeven <[email protected]>
> >> Reviewed-by: Wolfram Sang <[email protected]>
> >> Link: https://lore.kernel.org/r/73cea9d5e1a6639422c67e4df4285042e31c9fd5.1651497071.git.geert+renesas@glider.be
> >> Stable-dep-of: 0c51912331f8 ("arm64: dts: renesas: r8a779a0: Correct avb[01] reg sizes")
> >> Signed-off-by: Sasha Levin <[email protected]>
> >> ---
> >> arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 24 +++++++++++------------
> >> 1 file changed, 12 insertions(+), 12 deletions(-)
> >>
> >> diff --git a/arch/arm64/boot/dts/renesas/r8a779a0.dtsi b/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
> >> index 26899fb768a73..c7d1b79692c11 100644
> >> --- a/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
> >> +++ b/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
> >> @@ -583,7 +583,7 @@ hscif3: serial@e66a0000 {
> >>
> >> avb0: ethernet@e6800000 {
> >> compatible = "renesas,etheravb-r8a779a0",
> >> - "renesas,etheravb-rcar-gen3";
> >> + "renesas,etheravb-rcar-gen4";
> >
> >This change will break Ethernet, as the Renesas EtherAVB driver in
> >v5.15.x does not handle "renesas,etheravb-rcar-gen4" yet.
> >
> >That can be fixed by also backporting commit 949f252a8594a860
> >("net: ravb: Add R-Car Gen4 support") in v6.1.
>
> I'll just drop this patch instead, thanks!
Looks like it still made v5.15.153?
The easiest fix is to backport 949f252a8594a860, too.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68korg
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
On Wed, Mar 27, 2024 at 10:41:22AM +0100, Geert Uytterhoeven wrote:
> Hi Sasha,
>
> On Tue, Mar 26, 2024 at 8:18 PM Sasha Levin <[email protected]> wrote:
> > On Mon, Mar 25, 2024 at 09:43:31AM +0100, Geert Uytterhoeven wrote:
> > >On Mon, Mar 25, 2024 at 12:36 AM Sasha Levin <[email protected]> wrote:
> > >> From: Geert Uytterhoeven <[email protected]>
> > >>
> > >> [ Upstream commit a1721bbbdb5c6687d157f8b8714bba837f6028ac ]
> > >>
> > >> Despite the name, R-Car V3U is the first member of the R-Car Gen4
> > >> family. Hence update the compatible properties in various device nodes
> > >> to include family-specific compatible values for R-Car Gen4 instead of
> > >> R-Car Gen3:
> > >> - DMAC,
> > >> - (H)SCIF,
> > >> - I2C,
> > >> - IPMMU,
> > >> - WDT.
> > >>
> > >> Signed-off-by: Geert Uytterhoeven <[email protected]>
> > >> Reviewed-by: Wolfram Sang <[email protected]>
> > >> Link: https://lore.kernel.org/r/73cea9d5e1a6639422c67e4df4285042e31c9fd5.1651497071.git.geert+renesas@glider.be
> > >> Stable-dep-of: 0c51912331f8 ("arm64: dts: renesas: r8a779a0: Correct avb[01] reg sizes")
> > >> Signed-off-by: Sasha Levin <[email protected]>
> > >> ---
> > >> arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 24 +++++++++++------------
> > >> 1 file changed, 12 insertions(+), 12 deletions(-)
> > >>
> > >> diff --git a/arch/arm64/boot/dts/renesas/r8a779a0.dtsi b/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
> > >> index 26899fb768a73..c7d1b79692c11 100644
> > >> --- a/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
> > >> +++ b/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
> > >> @@ -583,7 +583,7 @@ hscif3: serial@e66a0000 {
> > >>
> > >> avb0: ethernet@e6800000 {
> > >> compatible = "renesas,etheravb-r8a779a0",
> > >> - "renesas,etheravb-rcar-gen3";
> > >> + "renesas,etheravb-rcar-gen4";
> > >
> > >This change will break Ethernet, as the Renesas EtherAVB driver in
> > >v5.15.x does not handle "renesas,etheravb-rcar-gen4" yet.
> > >
> > >That can be fixed by also backporting commit 949f252a8594a860
> > >("net: ravb: Add R-Car Gen4 support") in v6.1.
> >
> > I'll just drop this patch instead, thanks!
>
> Looks like it still made v5.15.153?
> The easiest fix is to backport 949f252a8594a860, too.
Now applied, thanks.
greg k-h
Hi Sasha,
Looks like I missed some things in my previous review...
On Mon, Mar 25, 2024 at 12:36 AM Sasha Levin <[email protected]> wrote:
> From: Geert Uytterhoeven <[email protected]>
>
> [ Upstream commit a1721bbbdb5c6687d157f8b8714bba837f6028ac ]
This is not the corresponding upstream commit for this commit
(a022251c2f950cd2 in v5.15.153).
It should be a1ca409cc050166a9e8ed183c1d4192f511cf6a2.
How could that happen? Interestingly, the backport in v6.1.83
(efab55e16c55c637) does have the correct upstream commit.
> Despite the name, R-Car V3U is the first member of the R-Car Gen4
> family. Hence update the compatible properties in various device nodes
> to include family-specific compatible values for R-Car Gen4 instead of
> R-Car Gen3:
> - DMAC,
> - (H)SCIF,
> - I2C,
> - IPMMU,
> - WDT.
Likewise, the description should be:
Despite the name, R-Car V3U is the first member of the R-Car Gen4
family. Hence update the compatible properties in various device nodes
to include family-specific compatible values for R-Car Gen4 instead of
R-Car Gen3:
- EtherAVB,
- MSIOF.
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> Reviewed-by: Wolfram Sang <[email protected]>
Likewise, bogus tag never given...
> Link: https://lore.kernel.org/r/73cea9d5e1a6639422c67e4df4285042e31c9fd5.1651497071.git.geert+renesas@glider.be
and a wrong link.
> Stable-dep-of: 0c51912331f8 ("arm64: dts: renesas: r8a779a0: Correct avb[01] reg sizes")
> Signed-off-by: Sasha Levin <[email protected]>
> --- a/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
> +++ b/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
> @@ -935,7 +935,7 @@ scif4: serial@e6c40000 {
>
> msiof0: spi@e6e90000 {
> compatible = "renesas,msiof-r8a779a0",
> - "renesas,rcar-gen3-msiof";
> + "renesas,rcar-gen4-msiof";
The Renesas MSIOF driver in v5.15.153 does not handle
"renesas,rcar-gen4-msiof" yet. Please backport commit ea9d001550abaf2f
("spi: sh-msiof: add generic Gen4 binding") in v6.1 to fix that.
> reg = <0 0xe6e90000 0 0x0064>;
> interrupts = <GIC_SPI 245 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&cpg CPG_MOD 618>;
Thanks!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68korg
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
On Tue, Apr 02, 2024 at 10:57:41AM +0200, Geert Uytterhoeven wrote:
>Hi Sasha,
>
>Looks like I missed some things in my previous review...
>
>On Mon, Mar 25, 2024 at 12:36 AM Sasha Levin <[email protected]> wrote:
>> From: Geert Uytterhoeven <[email protected]>
>>
>> [ Upstream commit a1721bbbdb5c6687d157f8b8714bba837f6028ac ]
>
>This is not the corresponding upstream commit for this commit
>(a022251c2f950cd2 in v5.15.153).
>It should be a1ca409cc050166a9e8ed183c1d4192f511cf6a2.
>How could that happen? Interestingly, the backport in v6.1.83
>(efab55e16c55c637) does have the correct upstream commit.
I suspect that this is me fat-fingering it in an attempt to pull it back
to 5.15 when we had a conversation about it on the mailing list.
[...]
>The Renesas MSIOF driver in v5.15.153 does not handle
>"renesas,rcar-gen4-msiof" yet. Please backport commit ea9d001550abaf2f
>("spi: sh-msiof: add generic Gen4 binding") in v6.1 to fix that.
I'll grab it, thanks!
--
Thanks,
Sasha