bcm270x.dtsi: Fix bad merge

This explains the complaints about alias names from dtc.

Signed-off-by: Phil Elwell <phil@raspberrypi.com>

diff --git a/arch/arm/boot/dts/broadcom/bcm270x-rpi.dtsi b/arch/arm/boot/dts/broadcom/bcm270x-rpi.dtsi
index 0601625..360fb05 100644 (file)
--- 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;
        };
 };