mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 06:08:08 +00:00
4c6e9a9943
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.30 Removed upstreamed: ipq806x/patches-6.6/130-mtd-rawnand-qcom-Fix-broken-misc_cmd_type-in-exec_op.patch[1] Manually rebased: generic/pending-6.6/760-net-core-add-optional-threading-for-backlog-processi.patch mediatek/patches-6.6/941-arm64-dts-mt7986-move-cpuboot-in-a-dedicated-node.patch All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.30&id=87fc30db0a2bb300de289dae7c5579cc27a3cbbd Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, flogic/glinet_gl-mt6000 Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, flogic/glinet_gl-mt6000 Signed-off-by: John Audia <therealgraysky@proton.me>
82 lines
2.5 KiB
Diff
82 lines
2.5 KiB
Diff
From 9f76be683a8ec498563c294bc1cc279468058302 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <9f76be683a8ec498563c294bc1cc279468058302.1678719283.git.lorenzo@kernel.org>
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Mon, 13 Mar 2023 15:53:30 +0100
|
|
Subject: [PATCH net-next] arm64: dts: mt7986: move dlm in a dedicated node
|
|
|
|
Since the dlm memory region is not part of the RAM SoC, move dlm in a
|
|
deidicated syscon node.
|
|
This patch helps to keep backward-compatibility with older version of
|
|
uboot codebase where we have a limit of 8 reserved-memory dts child
|
|
nodes.
|
|
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
---
|
|
arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 30 ++++++++++++-----------
|
|
1 file changed, 16 insertions(+), 14 deletions(-)
|
|
|
|
--- a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi
|
|
+++ b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi
|
|
@@ -101,16 +101,6 @@
|
|
reg = <0 0x4fd80000 0 0x240000>;
|
|
no-map;
|
|
};
|
|
-
|
|
- wo_dlm0: wo-dlm@151e8000 {
|
|
- reg = <0 0x151e8000 0 0x2000>;
|
|
- no-map;
|
|
- };
|
|
-
|
|
- wo_dlm1: wo-dlm@151f8000 {
|
|
- reg = <0 0x151f8000 0 0x2000>;
|
|
- no-map;
|
|
- };
|
|
};
|
|
|
|
soc {
|
|
@@ -515,10 +505,11 @@
|
|
reg = <0 0x15010000 0 0x1000>;
|
|
interrupt-parent = <&gic>;
|
|
interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>;
|
|
- memory-region = <&wo_emi0>, <&wo_dlm0>, <&wo_data>;
|
|
- memory-region-names = "wo-emi", "wo-dlm", "wo-data";
|
|
+ memory-region = <&wo_emi0>, <&wo_data>;
|
|
+ memory-region-names = "wo-emi", "wo-data";
|
|
mediatek,wo-ccif = <&wo_ccif0>;
|
|
mediatek,wo-ilm = <&wo_ilm0>;
|
|
+ mediatek,wo-dlm = <&wo_dlm0>;
|
|
mediatek,wo-cpuboot = <&wo_cpuboot>;
|
|
};
|
|
|
|
@@ -528,10 +519,11 @@
|
|
reg = <0 0x15011000 0 0x1000>;
|
|
interrupt-parent = <&gic>;
|
|
interrupts = <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>;
|
|
- memory-region = <&wo_emi1>, <&wo_dlm1>, <&wo_data>;
|
|
- memory-region-names = "wo-emi", "wo-dlm", "wo-data";
|
|
+ memory-region = <&wo_emi1>, <&wo_data>;
|
|
+ memory-region-names = "wo-emi", "wo-data";
|
|
mediatek,wo-ccif = <&wo_ccif1>;
|
|
mediatek,wo-ilm = <&wo_ilm1>;
|
|
+ mediatek,wo-dlm = <&wo_dlm1>;
|
|
mediatek,wo-cpuboot = <&wo_cpuboot>;
|
|
};
|
|
|
|
@@ -600,6 +592,16 @@
|
|
reg = <0 0x151f0000 0 0x8000>;
|
|
};
|
|
|
|
+ wo_dlm0: syscon@151e8000 {
|
|
+ compatible = "mediatek,mt7986-wo-dlm", "syscon";
|
|
+ reg = <0 0x151e8000 0 0x2000>;
|
|
+ };
|
|
+
|
|
+ wo_dlm1: syscon@151f8000 {
|
|
+ compatible = "mediatek,mt7986-wo-dlm", "syscon";
|
|
+ reg = <0 0x151f8000 0 0x2000>;
|
|
+ };
|
|
+
|
|
wo_cpuboot: syscon@15194000 {
|
|
compatible = "mediatek,mt7986-wo-cpuboot", "syscon";
|
|
reg = <0 0x15194000 0 0x1000>;
|