From bfb9c5204471da8fccd7e22f3e3ff558458772a5 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.com>
Date: Fri, 1 Dec 2023 16:09:05 +0000
Subject: [PATCH 0756/1085] bcm270x.dtsi: Fix bad merge

This explains the complaints about alias names from dtc.

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
---
 arch/arm/boot/dts/broadcom/bcm270x-rpi.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- a/arch/arm/boot/dts/broadcom/bcm270x-rpi.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm270x-rpi.dtsi
@@ -30,9 +30,6 @@
 		fb = &fb;
 		thermal = &thermal;
 		axiperf = &axiperf;
-		drm_fb0_vc4 = <&aliases>, "drm-fb0=",&vc4;
-		drm_fb1_vc4 = <&aliases>, "drm-fb1=",&vc4;
-		drm_fb2_vc4 = <&aliases>, "drm-fb2=",&vc4;
 	};
 
 	/* Define these notional regulators for use by overlays */
@@ -97,6 +94,9 @@
 		sdio_overclock = <&mmc>,"brcm,overclock-50:0",
 				 <&mmcnr>,"brcm,overclock-50:0";
 		axiperf      = <&axiperf>,"status";
+		drm_fb0_vc4 = <&aliases>, "drm-fb0=",&vc4;
+		drm_fb1_vc4 = <&aliases>, "drm-fb1=",&vc4;
+		drm_fb2_vc4 = <&aliases>, "drm-fb2=",&vc4;
 	};
 };
 
