2023-04-19 21:21:12

by Krzysztof Kozlowski

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

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 <[email protected]>

---

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

2023-04-22 12:11:16

by Konrad Dybcio

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

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 <[email protected]>
>
> ---
>
> 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 <[email protected]>

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";
>

2023-05-27 01:10:50

by Bjorn Andersson

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

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 <[email protected]>