[PATCH v2] arm64: broadcom: bcm2712: Drop rp1 overlay

[PATCH v2] arm64: broadcom: bcm2712: Drop rp1 overlay

[Rob Herring (Arm)]

It's a requirement that DT overlays be applied at build time in order to
validate them as overlays are not validated on their own, but the
rp1.dtbo is not applied to anything. The rp1.dtso overlay doesn't work
on its own as there are additional settings needed as seen in
bcm2712-rpi-5-b.dts. In addition, the 'rp1_nexus' node is applied to the
wrong place in the DT as it should be under a PCIe root port rather than
the host bridge. There's also a duplicate overlay in drivers/misc/rp1/.

For these reasons, just drop the overlay to fix the warning until all
these issues can be fixed.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
The missing applying of rp1.dtbo is now a warning in v6.19-rc1. This
should be sent to Linus ASAP.

v2:
 - Drop the overlay instead of trying to rework. The addition of
   ethernet0 alias complicates that.
---
 arch/arm64/boot/dts/broadcom/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
index 83d45afc6588..031875a277d7 100644
--- a/arch/arm64/boot/dts/broadcom/Makefile
+++ b/arch/arm64/boot/dts/broadcom/Makefile
@@ -14,8 +14,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-400.dtb \
 			      bcm2837-rpi-3-b.dtb \
 			      bcm2837-rpi-3-b-plus.dtb \
 			      bcm2837-rpi-cm3-io3.dtb \
-			      bcm2837-rpi-zero-2-w.dtb \
-			      rp1.dtbo
+			      bcm2837-rpi-zero-2-w.dtb
 
 subdir-y	+= bcmbca
 subdir-y	+= northstar2
-- 
2.51.0

Re: [PATCH v2] arm64: broadcom: bcm2712: Drop rp1 overlay

[Andrea della Porta]

Hi Rob,

On 13:38 Thu 11 Dec     , Rob Herring (Arm) wrote:
> It's a requirement that DT overlays be applied at build time in order to
> validate them as overlays are not validated on their own, but the
> rp1.dtbo is not applied to anything. The rp1.dtso overlay doesn't work
> on its own as there are additional settings needed as seen in
> bcm2712-rpi-5-b.dts. In addition, the 'rp1_nexus' node is applied to the
> wrong place in the DT as it should be under a PCIe root port rather than
> the host bridge. There's also a duplicate overlay in drivers/misc/rp1/.
> 
> For these reasons, just drop the overlay to fix the warning until all
> these issues can be fixed.
> 
> Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> ---
> The missing applying of rp1.dtbo is now a warning in v6.19-rc1. This
> should be sent to Linus ASAP.
> 
> v2:
>  - Drop the overlay instead of trying to rework. The addition of
>    ethernet0 alias complicates that.
> ---
>  arch/arm64/boot/dts/broadcom/Makefile | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
> index 83d45afc6588..031875a277d7 100644
> --- a/arch/arm64/boot/dts/broadcom/Makefile
> +++ b/arch/arm64/boot/dts/broadcom/Makefile
> @@ -14,8 +14,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-400.dtb \
>  			      bcm2837-rpi-3-b.dtb \
>  			      bcm2837-rpi-3-b-plus.dtb \
>  			      bcm2837-rpi-cm3-io3.dtb \
> -			      bcm2837-rpi-zero-2-w.dtb \
> -			      rp1.dtbo
> +			      bcm2837-rpi-zero-2-w.dtb

I'm preparing a rework patch that drops the overlay too, it will fix this warning
and the other concerns about RP1 DT hierarchy. Anyway, since this warning seems
to annoy a lot of people, feel free to apply it in the meantime and I'll adapt
accordingly, hence:

Reviewed-by: Andrea della Porta <andrea.porta@suse.com>

Thanks,
Andrea

>  
>  subdir-y	+= bcmbca
>  subdir-y	+= northstar2
> -- 
> 2.51.0
>