Re: [PATCH v2] arm64: dts: mediatek: mt7988a-bpi-r4: allow hw variants of bpi-r4

From: Daniel Golle
Date: Mon Apr 14 2025 - 08:33:22 EST


On Mon, Apr 14, 2025 at 11:27:23AM +0200, AngeloGioacchino Del Regno wrote:
> Il 12/04/25 12:21, Frank Wunderlich ha scritto:
> > From: Frank Wunderlich <frank-w@xxxxxxxxxxxxxxx>
> >
> > Sinovoip has released other variants of Bananapi-R4 board.
> > The known changes affecting only the LAN SFP+ slot which is replaced
> > by a 2.5G phy with optional PoE.
> >
> > Just move the common parts to a new dtsi and keep differences (only
> > i2c for lan-sfp) in dts.
> >
> > Signed-off-by: Frank Wunderlich <frank-w@xxxxxxxxxxxxxxx>
> > ---
> > v2:
> > - added basic dts for 2g5 variant
> > - moved i2c used for sfp-lan to board dts
> > ---
> > arch/arm64/boot/dts/mediatek/Makefile | 2 +
> > .../mediatek/mt7988a-bananapi-bpi-r4-2g5.dts | 5 +
> > .../dts/mediatek/mt7988a-bananapi-bpi-r4.dts | 404 +-----------------
> > .../dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi | 403 +++++++++++++++++
> > 4 files changed, 414 insertions(+), 400 deletions(-)
> > create mode 100644 arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-2g5.dts
> > create mode 100644 arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi
> >
> > diff --git a/arch/arm64/boot/dts/mediatek/Makefile b/arch/arm64/boot/dts/mediatek/Makefile
> > index 58484e830063..a1ebc9aa4ba6 100644
> > --- a/arch/arm64/boot/dts/mediatek/Makefile
> > +++ b/arch/arm64/boot/dts/mediatek/Makefile
> > @@ -22,6 +22,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-sd.dtbo
> > dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-rfb.dtb
> > dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986b-rfb.dtb
> > dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4.dtb
> > +dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-2g5.dtb
> > dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-emmc.dtbo
> > dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-sd.dtbo
> > dtb-$(CONFIG_ARCH_MEDIATEK) += mt8167-pumpkin.dtb
> > @@ -107,4 +108,5 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8516-pumpkin.dtb
> > DTC_FLAGS_mt7986a-bananapi-bpi-r3 := -@
> > DTC_FLAGS_mt7986a-bananapi-bpi-r3-mini := -@
> > DTC_FLAGS_mt7988a-bananapi-bpi-r4 := -@
> > +DTC_FLAGS_mt7988a-bananapi-bpi-r4-2g5 := -@
> > DTC_FLAGS_mt8395-radxa-nio-12l := -@
> > diff --git a/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-2g5.dts b/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-2g5.dts
> > new file mode 100644
> > index 000000000000..76eca976b968
> > --- /dev/null
> > +++ b/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-2g5.dts
> > @@ -0,0 +1,5 @@
> > +// SPDX-License-Identifier: GPL-2.0-only OR MIT
> > +
> > +/dts-v1/;
> > +
> > +#include "mt7988a-bananapi-bpi-r4.dtsi"
>
> This should at least have some different compatible, if not probably also a
> different model string - as it's a different device.
>
> compatible = "bananapi,bpi-r4-2g5", "bananapi,bpi-r4", "mediatek,mt7988a";

Imho it doesn't make sense to declare compatibility with the
"bananapi,bpi-r4" as the "bananapi,bpi-r4-2g5" is NOT compatible with the
"bananapi,bpi-r4". It's a different board and using firmware meant for the
"bananapi,bpi-r4-2g5" on the "bananapi,bpi-r4" (or vice versa) will result
in a non-working Ethernet port.