Re: [PATCH] arm64: dts: broadcom: bcm2712: rpi-5: Add ethernet0 alias

[Andrea della Porta <andrea.porta@suse.com>]

Hi Stanimir,

On 12:58 Sun 02 Nov     , Stanimir Varbanov wrote:
> Hi Laurent,
> 
> Thank you for the patch!
> 
> On 11/2/25 2:29 AM, Laurent Pinchart wrote:
> > The RP1 ethernet controller DT node contains a local-mac-address
> > property to pass the MAC address from the boot loader to the kernel. The
> > boot loader does not fill the MAC address as the ethernet0 alias is
> > missing. Add it.
> > 
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > ---
> >  arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts
> > index 04738bf281eb..fa438ac8c9ef 100644
> > --- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts
> > +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts
> > @@ -10,6 +10,7 @@ / {
> >  	model = "Raspberry Pi 5";
> >  
> >  	aliases {
> > +		ethernet0 = &rp1_eth;
> >  		serial10 = &uart10;
> >  	};
> >  
> 
> Unfortunately this does not compile:
> 
> make[1]: Entering directory '/rpi5/kobj'
>   GEN     Makefile
>   DTC     arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dtb
>   DTC     arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-ovl-rp1.dtb
>   DTC     arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dtb
> /linux/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts:12.10-15.4:
> ERROR (path_references): /aliases: Reference to non-existent node or
> label "rp1_eth"
> 
> ERROR: Input tree has errors, aborting (use -f to force output)
> make[4]: *** [/linux/scripts/Makefile.dtbs:132:
> arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-ovl-rp1.dtb] Error 2
> make[4]: *** Waiting for unfinished jobs....
> make[3]: *** [/linux/scripts/Makefile.build:556:
> arch/arm64/boot/dts/broadcom] Error 2
> 
> 
> I've made following fix on top of your patch, but I'm not sure that it
> is the correct one.
> 
> Andrea, could you comment please?

Correct, any reference to nodes declared in rp1-common.dtsi should go in
bcm2712-rpi-5-b.dts, everything else in bcm2712-rpi-5-b-ovl-rp1.dts.
Any aliases node under root node will be merged so just drop the label in
front.

Thanks,
Andrea

> 
> diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts
> b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts
> index bbad90d497fa..734b06ac5ba2 100644
> --- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts
> +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts
> @@ -9,8 +9,7 @@ / {
>  	compatible = "raspberrypi,5-model-b", "brcm,bcm2712";
>  	model = "Raspberry Pi 5";
> 
> -	aliases {
> -		ethernet0 = &rp1_eth;
> +	aliases: aliases {
>  		serial10 = &uart10;
>  	};
> 
> diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts
> b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts
> index 9f1976f0fd1a..26a99e72d441 100644
> --- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts
> +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts
> @@ -22,6 +22,10 @@ &pcie2 {
>  	#include "rp1-nexus.dtsi"
>  };
> 
> +&aliases {
> +	ethernet0 = &rp1_eth;
> +};
> +
>  &rp1_adc {
>  	vref-supply = <&rp1_vdd_3v3>;
>  	status = "okay";
> 
> ~Stan
>