OSDN Git Service

arm64: dts: qcom: sdm630-nile: correct duplicated reserved memory node
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Wed, 19 Apr 2023 21:19:21 +0000 (23:19 +0200)
committerBjorn Andersson <andersson@kernel.org>
Fri, 26 May 2023 20:34:03 +0000 (13:34 -0700)
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>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230419211921.79871-1-krzysztof.kozlowski@linaro.org
arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi

index 2ca713a..3033723 100644 (file)
                        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;
        linux,code = <KEY_VOLUMEUP>;
 };
 
+&qhee_code {
+       reg = <0x00 0x85800000 0x00 0x3700000>;
+};
+
 &qusb2phy0 {
        status = "okay";