diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi
index d6e4234077de..a7fc6b37165b 100644
--- a/arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi
+++ b/arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi
@@ -4,25 +4,6 @@
 #include "bcm2712.dtsi"
 
 / {
-#ifndef FIRMWARE_UPDATED
-	#size-cells = <1>;
-
-	reserved-memory {
-		ranges;
-		#address-cells = <2>;
-		#size-cells = <1>;
-
-		atf@0 {
-			reg = <0x0 0x0 0x80000>;
-		};
-
-		linux,cma {
-			size = <0x4000000>; /* 64MB */
-			alloc-ranges = <0x0 0x00000000 0x40000000>;
-		};
-	};
-#endif
-
 	arm-pmu {
 		compatible = "arm,cortex-a76-pmu";
 		interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
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 0a99dbe20e87..a9c9eb978045 100644
--- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts
+++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts
@@ -17,11 +17,7 @@
 	/* Will be filled by the bootloader */
 	memory@0 {
 		device_type = "memory";
-#ifndef FIRMWARE_UPDATED
-		reg = <0 0 0x28000000>;
-#else
 		reg = <0 0 0 0x28000000>;
-#endif
 	};
 
 	leds: leds {
diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi
index f1a8d6776703..7558978cbf92 100644
--- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi
+++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi
@@ -16,11 +16,7 @@
 	/* Will be filled by the bootloader */
 	memory@0 {
 		device_type = "memory";
-#ifndef FIRMWARE_UPDATED
-		reg = <0 0 0x28000000>;
-#else
 		reg = <0 0 0 0x28000000>;
-#endif
 	};
 
 	leds: leds {
diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi
index 52452d0bec59..e6a12bd2b941 100644
--- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi
+++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi
@@ -297,11 +297,7 @@ pciex4: &pcie2 { };
 		compatible = "raspberrypi,bootloader-config", "nvmem-rmem";
 		#address-cells = <1>;
 		#size-cells = <1>;
-#ifndef FIRMWARE_UPDATED
-		reg = <0x0 0x0 0x0>;
-#else
 		reg = <0x0 0x0 0x0 0x0>;
-#endif
 		no-map;
 		status = "disabled";
 	};
@@ -313,11 +309,7 @@ pciex4: &pcie2 { };
 		compatible = "raspberrypi,bootloader-public-key", "nvmem-rmem";
 		#address-cells = <1>;
 		#size-cells = <1>;
-#ifndef FIRMWARE_UPDATED
-		reg = <0x0 0x0 0x0>;
-#else
 		reg = <0x0 0x0 0x0 0x0>;
-#endif
 		no-map;
 		status = "disabled";
 	};
diff --git a/arch/arm64/boot/dts/broadcom/bcm2712.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712.dtsi
index 5cf747c71004..0e7570e727c5 100644
--- a/arch/arm64/boot/dts/broadcom/bcm2712.dtsi
+++ b/arch/arm64/boot/dts/broadcom/bcm2712.dtsi
@@ -608,11 +608,7 @@
 
 	hvs: hvs@107c580000 {
 		compatible = "brcm,bcm2712-hvs";
-#ifndef FIRMWARE_UPDATED
-		reg = <0x10 0x7c580000 0x1a000>;
-#else
 		reg = <0x10 0x7c580000 0x0 0x1a000>;
-#endif
 		interrupt-parent = <&disp_intr>;
 		interrupts = <2>, <9>, <16>;
 		interrupt-names = "ch0-eof", "ch1-eof", "ch2-eof";