raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +00:00
Code Issues Projects Releases Wiki Activity

arm64: dts: Remove the Pi5 FIRMWARE_UPDATED guards

Browse Source 
The Raspberry Pi firmware has assumed that top level #size-cells value
in dtb files is 1. As a result, the dts source files have had to use
32-bit sizes, making it awkward to declare memory regions of 4GB or
larger, requiring them to be split into chunks. This primarily affects
Pi 5, where the dts source has made use of conditional compilation to
choose either 64-bit or 32-bit sizes, based on the presence or absence
of the defined cpp symbol FIRMWARE_UPDATED.

As of EEPROM release pieeprom-2025-02-11, the firmware has read and made
use of the actual #size-cells value declared in the dtb, allowing the
use of 64-bit sizes. Remove the conditional sections, retaining the
64-bit size values.

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
This commit is contained in:
Phil Elwell
2025-12-04 14:00:49 +00:00
committed by Phil Elwell
parent 575595f514
commit ec2667d32d
5 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi
View File

@@ -4,25 +4,6 @@
#include "bcm2712.dtsi" #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 { arm-pmu {
compatible = "arm,cortex-a76-pmu"; compatible = "arm,cortex-a76-pmu";
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,

4
arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts
View File

@@ -17,11 +17,7 @@
/* Will be filled by the bootloader */ /* Will be filled by the bootloader */
memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
#ifndef FIRMWARE_UPDATED
reg = <0 0 0x28000000>;
#else
reg = <0 0 0 0x28000000>; reg = <0 0 0 0x28000000>;
#endif
}; };
leds: leds { leds: leds {

4
arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi
View File

@@ -16,11 +16,7 @@
/* Will be filled by the bootloader */ /* Will be filled by the bootloader */
memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
#ifndef FIRMWARE_UPDATED
reg = <0 0 0x28000000>;
#else
reg = <0 0 0 0x28000000>; reg = <0 0 0 0x28000000>;
#endif
}; };
leds: leds { leds: leds {

8
arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi
View File

@@ -297,11 +297,7 @@ pciex4: &pcie2 { };
compatible = "raspberrypi,bootloader-config", "nvmem-rmem"; compatible = "raspberrypi,bootloader-config", "nvmem-rmem";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
#ifndef FIRMWARE_UPDATED
reg = <0x0 0x0 0x0>;
#else
reg = <0x0 0x0 0x0 0x0>; reg = <0x0 0x0 0x0 0x0>;
#endif
no-map; no-map;
status = "disabled"; status = "disabled";
}; };
@@ -313,11 +309,7 @@ pciex4: &pcie2 { };
compatible = "raspberrypi,bootloader-public-key", "nvmem-rmem"; compatible = "raspberrypi,bootloader-public-key", "nvmem-rmem";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
#ifndef FIRMWARE_UPDATED
reg = <0x0 0x0 0x0>;
#else
reg = <0x0 0x0 0x0 0x0>; reg = <0x0 0x0 0x0 0x0>;
#endif
no-map; no-map;
status = "disabled"; status = "disabled";
}; };

4
arch/arm64/boot/dts/broadcom/bcm2712.dtsi
View File

@@ -608,11 +608,7 @@
hvs: hvs@107c580000 { hvs: hvs@107c580000 {
compatible = "brcm,bcm2712-hvs"; compatible = "brcm,bcm2712-hvs";
#ifndef FIRMWARE_UPDATED
reg = <0x10 0x7c580000 0x1a000>;
#else
reg = <0x10 0x7c580000 0x0 0x1a000>; reg = <0x10 0x7c580000 0x0 0x1a000>;
#endif
interrupt-parent = <&disp_intr>; interrupt-parent = <&disp_intr>;
interrupts = <2>, <9>, <16>; interrupts = <2>, <9>, <16>;
interrupt-names = "ch0-eof", "ch1-eof", "ch2-eof"; interrupt-names = "ch0-eof", "ch1-eof", "ch2-eof";