Skip to content

arm64: dts: Remove the Pi5 FIRMWARE_UPDATED guards #7166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pelwell merged 1 commit into from
Dec 5, 2025
+0 −39
Merged

arm64: dts: Remove the Pi5 FIRMWARE_UPDATED guards #7166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
Expand Down
4 changes: 0 additions & 4 deletions arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 0 additions & 4 deletions arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 0 additions & 8 deletions arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
Expand All @@ -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";
};
Expand Down
4 changes: 0 additions & 4 deletions arch/arm64/boot/dts/broadcom/bcm2712.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down