[PATCH net-next 07/10] arm64: dts: mt7986: move ilm in a dedicated node

[Matthias Brugger]

On 20/03/2023 17:58, Lorenzo Bianconi wrote:
> 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 at kernel.org>

Acked-by: Matthias Brugger <matthias.bgg at gmail.com>

> ---
>   arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 34 +++++++++++------------
>   1 file changed, 16 insertions(+), 18 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi
> index 668b6cfa6a3d..a0d96d232ee5 100644
> --- a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi
> +++ b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi
> @@ -89,16 +89,6 @@ wo_emi1: wo-emi at 4fd40000 {
>   			no-map;
>   		};
>   
> -		wo_ilm0: wo-ilm at 151e0000 {
> -			reg = <0 0x151e0000 0 0x8000>;
> -			no-map;
> -		};
> -
> -		wo_ilm1: wo-ilm at 151f0000 {
> -			reg = <0 0x151f0000 0 0x8000>;
> -			no-map;
> -		};
> -
>   		wo_data: wo-data at 4fd80000 {
>   			reg = <0 0x4fd80000 0 0x240000>;
>   			no-map;
> @@ -454,11 +444,10 @@ wed0: wed at 15010000 {
>   			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>;
>   		};
>   
> @@ -468,11 +457,10 @@ wed1: wed at 15011000 {
>   			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>;
>   		};
>   
> @@ -490,6 +478,16 @@ wo_ccif1: syscon at 151ad000 {
>   			interrupts = <GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>;
>   		};
>   
> +		wo_ilm0: syscon at 151e0000 {
> +			compatible = "mediatek,mt7986-wo-ilm", "syscon";
> +			reg = <0 0x151e0000 0 0x8000>;
> +		};
> +
> +		wo_ilm1: syscon at 151f0000 {
> +			compatible = "mediatek,mt7986-wo-ilm", "syscon";
> +			reg = <0 0x151f0000 0 0x8000>;
> +		};
> +
>   		wo_cpuboot: syscon at 15194000 {
>   			compatible = "mediatek,mt7986-wo-cpuboot", "syscon";
>   			reg = <0 0x15194000 0 0x1000>;