mirror of
https://github.com/LiBwrt-op/openwrt-6.x.git
synced 2025-12-16 16:57:28 +00:00
919e0001b4
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.56 Removed upstreamed: - airoha/patches-6.12/028-v6.13-spi-airoha-do-not-keep-tx-rx-dma-buffer-always-mappe.patch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.56&id=ad00df9ee321e87639a740e6e372f11bfe5af52c - airoha/patches-6.12/029-01-spi-airoha-return-an-error-for-continuous-mode-di.patch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/spi?h=v6.12.56&id=f5dc5baa5b04ceb0fca2460bc2863921f0e7ede5 - airoha/patches-6.12/029-03-spi-airoha-add-support-of-dual-quad-wires-spi-mod.patch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.56&id=182221d35c1427630ea6d9de9953c2280848c851 - airoha/patches-6.12/029-05-spi-airoha-switch-back-to-non-dma-mode-in-the-cas.patch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.56&id=8063828625359826316c5a1885e9ea341bbdb1b3 - airoha/patches-6.12/029-06-spi-airoha-fix-reading-writing-of-flashes-with-mo.patch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.56&id=4e9a2d592d91b902f918158c1049eef19f9cce90 - mediatek/patches-6.12/810-tty-serial-8250_mtk-enable-baud-clock.patch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.56&id=7cbf5ed24a26d4d80dcc19eb2259fdb9b179d5cf All other patches automatically rebased. Build system: x86/64 Build-tested: mediatek/filogic Run-tested: mediatek/filogic Signed-off-by: Edoardo Pinci <epinci@outlook.com> Link: https://github.com/openwrt/openwrt/pull/20589 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
87 lines
2.5 KiB
Diff
87 lines
2.5 KiB
Diff
From bbce11ca0c1999ff722e7ed39c23fa2a09ea162e Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Tue, 4 Feb 2025 16:07:55 +0000
|
|
Subject: [PATCH] arm64: dts: Prepare for #size-cells = 2
|
|
|
|
With a future release of the firmware, it will be possible to use dts
|
|
files with a top-level #size-cells of 2. This patch adds the remaining
|
|
necessary changes to make that work, gated by the macro symbol
|
|
FIRMWARE_UDPATED.
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
---
|
|
arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts | 4 ++++
|
|
arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi | 4 ++++
|
|
arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi | 8 ++++++++
|
|
arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 4 ++++
|
|
4 files changed, 20 insertions(+)
|
|
|
|
--- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts
|
|
+++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts
|
|
@@ -17,7 +17,11 @@
|
|
/* 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 {
|
|
--- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi
|
|
+++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi
|
|
@@ -16,7 +16,11 @@
|
|
/* 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 {
|
|
--- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi
|
|
+++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi
|
|
@@ -279,7 +279,11 @@ 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";
|
|
};
|
|
@@ -291,7 +295,11 @@ 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";
|
|
};
|
|
--- a/arch/arm64/boot/dts/broadcom/bcm2712.dtsi
|
|
+++ b/arch/arm64/boot/dts/broadcom/bcm2712.dtsi
|
|
@@ -466,7 +466,11 @@
|
|
|
|
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";
|