| Message ID | d74e38de00ad1b858b59a7ef6cb02321b0faf750.1679330630.git.lorenzo@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | mtk: wed: move cpuboot, ilm and dlm in dedicated dts nodes | expand |
On 20/03/2023 17:58, Lorenzo Bianconi wrote: > 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> Acked-by: Matthias Brugger <matthias.bgg@gmail.com> > --- > arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 30 ++++++++++++----------- > 1 file changed, 16 insertions(+), 14 deletions(-) > > diff --git a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi > index a0d96d232ee5..0ae6aa59d3c6 100644 > --- a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi > +++ b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi > @@ -93,16 +93,6 @@ wo_data: wo-data@4fd80000 { > 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; > - }; > }; > > timer { > @@ -444,10 +434,11 @@ wed0: wed@15010000 { > 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>; > }; > > @@ -457,10 +448,11 @@ wed1: wed@15011000 { > 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>; > }; > > @@ -488,6 +480,16 @@ wo_ilm1: syscon@151f0000 { > 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>;
diff --git a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi index a0d96d232ee5..0ae6aa59d3c6 100644 --- a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi @@ -93,16 +93,6 @@ wo_data: wo-data@4fd80000 { 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; - }; }; timer { @@ -444,10 +434,11 @@ wed0: wed@15010000 { 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>; }; @@ -457,10 +448,11 @@ wed1: wed@15011000 { 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>; }; @@ -488,6 +480,16 @@ wo_ilm1: syscon@151f0000 { 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>;
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(-)