Re: [PATCH 5.15 110/317] arm64: dts: renesas: r8a779a0: Update to R-Car Gen4 compatible values

From: Greg KH
Date: Wed Mar 27 2024 - 11:17:42 EST


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 <sashal@xxxxxxxxxx> 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 <sashal@xxxxxxxxxx> wrote:
> > >> From: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
> > >>
> > >> [ 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 <geert+renesas@xxxxxxxxx>
> > >> Reviewed-by: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx>
> > >> Link: https://lore.kernel.org/r/73cea9d5e1a6639422c67e4df4285042e31c9fd5.1651497071.git.geert+renesas@xxxxxxxxx
> > >> Stable-dep-of: 0c51912331f8 ("arm64: dts: renesas: r8a779a0: Correct avb[01] reg sizes")
> > >> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
> > >> ---
> > >> 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