[RFT RFC PATCH] arm64: dts: qcom: sdm630-nile: correct duplicated reserved memory node

[RFT RFC PATCH] arm64: dts: qcom: sdm630-nile: correct duplicated reserved memory node

[Krzysztof Kozlowski]

SoC DTSI already comes with 85800000 reserved memory node, so assume the
author wanted to update its length.  This fixes dtbs W=1 warning:

  Warning (unique_unit_address_if_enabled): /reserved-memory/qhee-code@85800000: duplicate unit-address (also used in node /reserved-memory/reserved@85800000)

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

---

What was the original code intention?
---
 arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
index 2ca713a3902a..3033723fc6ff 100644
--- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
@@ -138,11 +138,6 @@ debug@ffb00000 {
 			no-map;
 		};
 
-		reserved@85800000 {
-			reg = <0x00 0x85800000 0x00 0x3700000>;
-			no-map;
-		};
-
 		cont_splash_mem: splash@9d400000 {
 			reg = <0 0x9d400000 0 (1920 * 1080 * 4)>;
 			no-map;
@@ -256,6 +251,10 @@ &pon_resin {
 	linux,code = <KEY_VOLUMEUP>;
 };
 
+&qhee_code {
+	reg = <0x00 0x85800000 0x00 0x3700000>;
+};
+
 &qusb2phy0 {
 	status = "okay";
 
-- 
2.34.1

Re: [RFT RFC PATCH] arm64: dts: qcom: sdm630-nile: correct duplicated reserved memory node

[Konrad Dybcio]

On 19.04.2023 23:19, Krzysztof Kozlowski wrote:
> SoC DTSI already comes with 85800000 reserved memory node, so assume the
> author wanted to update its length.  This fixes dtbs W=1 warning:
> 
>   Warning (unique_unit_address_if_enabled): /reserved-memory/qhee-code@85800000: duplicate unit-address (also used in node /reserved-memory/reserved@85800000)
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> 
> ---
> 
> What was the original code intention?
Hm, perhaps the original introduction had the common definition
wrong.. I see a downstream sdm630.dtsi and sdm660.dtsi having
the qhee_code sized at 0x37...

I'm fine with either resolution, I think..

Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
> index 2ca713a3902a..3033723fc6ff 100644
> --- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
> @@ -138,11 +138,6 @@ debug@ffb00000 {
>  			no-map;
>  		};
>  
> -		reserved@85800000 {
> -			reg = <0x00 0x85800000 0x00 0x3700000>;
> -			no-map;
> -		};
> -
>  		cont_splash_mem: splash@9d400000 {
>  			reg = <0 0x9d400000 0 (1920 * 1080 * 4)>;
>  			no-map;
> @@ -256,6 +251,10 @@ &pon_resin {
>  	linux,code = <KEY_VOLUMEUP>;
>  };
>  
> +&qhee_code {
> +	reg = <0x00 0x85800000 0x00 0x3700000>;
> +};
> +
>  &qusb2phy0 {
>  	status = "okay";
>  

Re: [RFT RFC PATCH] arm64: dts: qcom: sdm630-nile: correct duplicated reserved memory node

[Bjorn Andersson]

On Wed, 19 Apr 2023 23:19:21 +0200, Krzysztof Kozlowski wrote:
> SoC DTSI already comes with 85800000 reserved memory node, so assume the
> author wanted to update its length.  This fixes dtbs W=1 warning:
> 
>   Warning (unique_unit_address_if_enabled): /reserved-memory/qhee-code@85800000: duplicate unit-address (also used in node /reserved-memory/reserved@85800000)
> 
> 

Applied, thanks!

[1/1] arm64: dts: qcom: sdm630-nile: correct duplicated reserved memory node
      commit: 5b85de0d51776cae7c165ec2785d1be06ebc9f21

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>