ARM: dts: qcom: msm8660: override nodes by label

Using node paths to extend or override a device tree node is error
prone.  If there was a typo error, a new node will be created instead of
extending the existing node.  This will lead to run-time errors that
could be hard to detect.

A mistyped label on the other hand, will cause a dtc compile error
(during build time).  This also reduces the indentation making the code
easier to read.

The pre/post DTBS are the same.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220810080516.166866-3-krzysztof.kozlowski@linaro.org

diff --git a/arch/arm/boot/dts/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom-msm8660-surf.dts
index 414280d..63b8f42 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8660-surf.dts
+++ b/arch/arm/boot/dts/qcom-msm8660-surf.dts
@@ -16,14 +16,6 @@
        };
 
        soc {
-               gsbi@19c00000 {
-                       status = "okay";
-                       qcom,mode = <GSBI_PROT_I2C_UART>;
-                       serial@19c40000 {
-                               status = "okay";
-                       };
-               };
-
                /* Temporary fixed regulator */
                vsdcc_fixed: vsdcc-regulator {
                        compatible = "regulator-fixed";
@@ -32,21 +24,16 @@
                        regulator-max-microvolt = <2700000>;
                        regulator-always-on;
                };
+       };
+};
 
-               amba {
-                       /* eMMC */
-                       sdcc1: mmc@12400000 {
-                               status = "okay";
-                               vmmc-supply = <&vsdcc_fixed>;
-                       };
+&gsbi12 {
+       qcom,mode = <GSBI_PROT_I2C_UART>;
+       status = "okay";
+};
 
-                       /* External micro SD card */
-                       sdcc3: mmc@12180000 {
-                               status = "okay";
-                               vmmc-supply = <&vsdcc_fixed>;
-                       };
-               };
-       };
+&gsbi12_serial {
+       status = "okay";
 };
 
 &pm8058 {
@@ -76,3 +63,15 @@
                keypad,num-columns = <5>;
        };
 };
+
+/* eMMC */
+&sdcc1 {
+       vmmc-supply = <&vsdcc_fixed>;
+       status = "okay";
+};
+
+/* External micro SD card */
+&sdcc3 {
+       vmmc-supply = <&vsdcc_fixed>;
+       status = "okay";
+};