mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 23:12:32 +00:00
b04f245c39
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.23 Removed upstreamed: pending-6.6/735-net-mediatek-mtk_eth_soc-release-MAC_MCR_FORCE_LINK-.patch[1] pending-6.6/736-net-ethernet-mtk_eth_soc-fix-PPE-hanging-issue.patch[2] mediatek/patches-6.6/232-clk-mediatek-mt7981-topckgen-flag-SGM_REG_SEL-as-cri.patch[3] Manually rebased: mediatek/patches-6.6/100-dts-update-mt7622-rfb1.patch Added: generic/backports-6.6/981-mtd-spinand-Add-support-for-5-byte-IDs.patch[4] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.23&id=1f32abb474c1c9bdb21d9eda74c325a0b3a162e5 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.23&id=943c14ece95eb1cf98d477462aebcbfdfd714633 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.23&id=6ff01b314149d1cf59caebc29384f0beed21cba4 4. See comments in https://github.com/openwrt/openwrt/pull/14992 regarding broken flogic/xiaomi_redmi-router-ax6000-ubootmod Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, flogic/glinet_gl-mt6000 Run-tested: x86/64/AMD Cezannei, flogic/xiaomi_redmi-router-ax6000-ubootmod, flogic/glinet_gl-mt6000 Signed-off-by: John Audia <therealgraysky@proton.me>
84 lines
2.6 KiB
Diff
84 lines
2.6 KiB
Diff
From 01561065af5bf1d2a4244896d897e3a1eafbcd46 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <01561065af5bf1d2a4244896d897e3a1eafbcd46.1678717704.git.lorenzo@kernel.org>
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Mon, 13 Mar 2023 15:10:56 +0100
|
|
Subject: [PATCH net-next] arm64: dts: mt7986: move ilm in a dedicated node
|
|
|
|
Since the ilm memory region is not part of the RAM SoC, move ilm 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 | 34 +++++++++++------------
|
|
1 file changed, 16 insertions(+), 18 deletions(-)
|
|
|
|
--- a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi
|
|
+++ b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi
|
|
@@ -97,16 +97,6 @@
|
|
no-map;
|
|
};
|
|
|
|
- wo_ilm0: wo-ilm@151e0000 {
|
|
- reg = <0 0x151e0000 0 0x8000>;
|
|
- no-map;
|
|
- };
|
|
-
|
|
- wo_ilm1: wo-ilm@151f0000 {
|
|
- reg = <0 0x151f0000 0 0x8000>;
|
|
- no-map;
|
|
- };
|
|
-
|
|
wo_data: wo-data@4fd80000 {
|
|
reg = <0 0x4fd80000 0 0x240000>;
|
|
no-map;
|
|
@@ -536,11 +526,10 @@
|
|
reg = <0 0x15010000 0 0x1000>;
|
|
interrupt-parent = <&gic>;
|
|
interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>;
|
|
- memory-region = <&wo_emi0>, <&wo_ilm0>, <&wo_dlm0>,
|
|
- <&wo_data>;
|
|
- memory-region-names = "wo-emi", "wo-ilm", "wo-dlm",
|
|
- "wo-data";
|
|
+ memory-region = <&wo_emi0>, <&wo_dlm0>, <&wo_data>;
|
|
+ memory-region-names = "wo-emi", "wo-dlm", "wo-data";
|
|
mediatek,wo-ccif = <&wo_ccif0>;
|
|
+ mediatek,wo-ilm = <&wo_ilm0>;
|
|
mediatek,wo-cpuboot = <&wo_cpuboot>;
|
|
};
|
|
|
|
@@ -550,11 +539,10 @@
|
|
reg = <0 0x15011000 0 0x1000>;
|
|
interrupt-parent = <&gic>;
|
|
interrupts = <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>;
|
|
- memory-region = <&wo_emi1>, <&wo_ilm1>, <&wo_dlm1>,
|
|
- <&wo_data>;
|
|
- memory-region-names = "wo-emi", "wo-ilm", "wo-dlm",
|
|
- "wo-data";
|
|
+ memory-region = <&wo_emi1>, <&wo_dlm1>, <&wo_data>;
|
|
+ memory-region-names = "wo-emi", "wo-dlm", "wo-data";
|
|
mediatek,wo-ccif = <&wo_ccif1>;
|
|
+ mediatek,wo-ilm = <&wo_ilm1>;
|
|
mediatek,wo-cpuboot = <&wo_cpuboot>;
|
|
};
|
|
|
|
@@ -572,6 +560,16 @@
|
|
interrupts = <GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>;
|
|
};
|
|
|
|
+ wo_ilm0: syscon@151e0000 {
|
|
+ compatible = "mediatek,mt7986-wo-ilm", "syscon";
|
|
+ reg = <0 0x151e0000 0 0x8000>;
|
|
+ };
|
|
+
|
|
+ wo_ilm1: syscon@151f0000 {
|
|
+ compatible = "mediatek,mt7986-wo-ilm", "syscon";
|
|
+ reg = <0 0x151f0000 0 0x8000>;
|
|
+ };
|
|
+
|
|
wo_cpuboot: syscon@15194000 {
|
|
compatible = "mediatek,mt7986-wo-cpuboot", "syscon";
|
|
reg = <0 0x15194000 0 0x1000>;
|