diff mbox series

arm64: dts: marvell: fix non-existed cpu referrence in armada-ap806-dual.dtsi

Message ID 20200209212016.27062-1-vadym.kochan@plvision.eu (mailing list archive)
State Mainlined
Commit 664d9ebf807355a034b949b9c4b9739d3f14dc13
Headers show
Series arm64: dts: marvell: fix non-existed cpu referrence in armada-ap806-dual.dtsi | expand

Commit Message

Vadym Kochan Feb. 9, 2020, 9:20 p.m. UTC
armada-ap806-dual.dtsi includes armada-ap806.dtsi which describes
thermal zones for 4 cpus but only cpu0 and cpu1 only exists for dual
configuration, this makes dtb compilation fail. Fix it by removing
thermal zone nodes for non-existed cpus for dual configuration.

Signed-off-by: Vadym Kochan <vadym.kochan@plvision.eu>
---
 arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Vadym Kochan Feb. 29, 2020, 11:06 p.m. UTC | #1
Hi,

Just softly ping if I sent it to the right direction.

On Sun, Feb 09, 2020 at 11:20:30PM +0200, Vadym Kochan wrote:
> armada-ap806-dual.dtsi includes armada-ap806.dtsi which describes
> thermal zones for 4 cpus but only cpu0 and cpu1 only exists for dual
> configuration, this makes dtb compilation fail. Fix it by removing
> thermal zone nodes for non-existed cpus for dual configuration.
> 
> Signed-off-by: Vadym Kochan <vadym.kochan@plvision.eu>
> ---
>  arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
> index 09849558a776..fcab5173fe67 100644
> --- a/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
> @@ -53,4 +53,9 @@
>  			cache-sets = <512>;
>  		};
>  	};
> +
> +	thermal-zones {
> +		/delete-node/ ap-thermal-cpu2;
> +		/delete-node/ ap-thermal-cpu3;
> +	};
>  };
> -- 
> 2.17.1
> 

Regards,
Vadym Kochan
Gregory CLEMENT March 1, 2020, 7:44 a.m. UTC | #2
Le 1 mars 2020 00:06:56 GMT+01:00, Vadym Kochan <vadym.kochan@plvision.eu> a écrit :
>Hi,
>

Hello
>Just softly ping if I sent it to the right direction.
It looks ok, and was on the list of patches to apply 

Sorry for the delay
>
>On Sun, Feb 09, 2020 at 11:20:30PM +0200, Vadym Kochan wrote:
>> armada-ap806-dual.dtsi includes armada-ap806.dtsi which describes
>> thermal zones for 4 cpus but only cpu0 and cpu1 only exists for dual
>> configuration, this makes dtb compilation fail. Fix it by removing
>> thermal zone nodes for non-existed cpus for dual configuration.
>> 
>> Signed-off-by: Vadym Kochan <vadym.kochan@plvision.eu>
>> ---
>>  arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 5 +++++
>>  1 file changed, 5 insertions(+)
>> 
>> diff --git a/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
>b/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
>> index 09849558a776..fcab5173fe67 100644
>> --- a/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
>> +++ b/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
>> @@ -53,4 +53,9 @@
>>  			cache-sets = <512>;
>>  		};
>>  	};
>> +
>> +	thermal-zones {
>> +		/delete-node/ ap-thermal-cpu2;
>> +		/delete-node/ ap-thermal-cpu3;
>> +	};
>>  };
>> -- 
>> 2.17.1
>> 
>
>Regards,
>Vadym Kochan
Gregory CLEMENT March 13, 2020, 8:35 p.m. UTC | #3
Hi Vadym,

> armada-ap806-dual.dtsi includes armada-ap806.dtsi which describes
> thermal zones for 4 cpus but only cpu0 and cpu1 only exists for dual
> configuration, this makes dtb compilation fail. Fix it by removing
> thermal zone nodes for non-existed cpus for dual configuration.
>
> Signed-off-by: Vadym Kochan <vadym.kochan@plvision.eu>

Applied on mvebu/dt64

Thanks,

Gregory

> ---
>  arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
> index 09849558a776..fcab5173fe67 100644
> --- a/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
> @@ -53,4 +53,9 @@
>  			cache-sets = <512>;
>  		};
>  	};
> +
> +	thermal-zones {
> +		/delete-node/ ap-thermal-cpu2;
> +		/delete-node/ ap-thermal-cpu3;
> +	};
>  };
> -- 
> 2.17.1
>
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
index 09849558a776..fcab5173fe67 100644
--- a/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
@@ -53,4 +53,9 @@ 
 			cache-sets = <512>;
 		};
 	};
+
+	thermal-zones {
+		/delete-node/ ap-thermal-cpu2;
+		/delete-node/ ap-thermal-cpu3;
+	};
 };