ARM: dts: qcom: msm8960: 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-1-krzysztof.kozlowski@linaro.org

diff --git a/arch/arm/boot/dts/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom-msm8960-cdp.dts
index d1fd0fe..9157e3c 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8960-cdp.dts
+++ b/arch/arm/boot/dts/qcom-msm8960-cdp.dts
@@ -15,318 +15,6 @@
                stdout-path = "serial0:115200n8";
        };
 
-       soc {
-               gsbi@16400000 {
-                       status = "okay";
-                       qcom,mode = <GSBI_PROT_I2C_UART>;
-                       serial@16440000 {
-                               status = "okay";
-                       };
-               };
-
-               amba {
-                       /* eMMC */
-                       sdcc1: mmc@12400000 {
-                               status = "okay";
-                       };
-
-                       /* External micro SD card */
-                       sdcc3: mmc@12180000 {
-                               status = "okay";
-                       };
-               };
-
-               rpm@108000 {
-                       regulators {
-                               compatible = "qcom,rpm-pm8921-regulators";
-                               vin_lvs1_3_6-supply = <&pm8921_s4>;
-                               vin_lvs2-supply = <&pm8921_s4>;
-                               vin_lvs4_5_7-supply = <&pm8921_s4>;
-                               vdd_ncp-supply = <&pm8921_l6>;
-                               vdd_l1_l2_l12_l18-supply = <&pm8921_s4>;
-                               vdd_l21_l23_l29-supply = <&pm8921_s8>;
-                               vdd_l24-supply = <&pm8921_s1>;
-                               vdd_l25-supply = <&pm8921_s1>;
-                               vdd_l27-supply = <&pm8921_s7>;
-                               vdd_l28-supply = <&pm8921_s7>;
-
-                               /* Buck SMPS */
-                               pm8921_s1: s1 {
-                                       regulator-always-on;
-                                       regulator-min-microvolt = <1225000>;
-                                       regulator-max-microvolt = <1225000>;
-                                       qcom,switch-mode-frequency = <3200000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_s2: s2 {
-                                       regulator-min-microvolt = <1300000>;
-                                       regulator-max-microvolt = <1300000>;
-                                       qcom,switch-mode-frequency = <1600000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_s3: s3 {
-                                       regulator-min-microvolt = <500000>;
-                                       regulator-max-microvolt = <1150000>;
-                                       qcom,switch-mode-frequency = <4800000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_s4: s4 {
-                                       regulator-always-on;
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                                       qcom,switch-mode-frequency = <1600000>;
-                                       bias-pull-down;
-                                       qcom,force-mode = <QCOM_RPM_FORCE_MODE_AUTO>;
-                               };
-
-                               pm8921_s7: s7 {
-                                       regulator-min-microvolt = <1150000>;
-                                       regulator-max-microvolt = <1150000>;
-                                       qcom,switch-mode-frequency = <3200000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_s8: s8 {
-                                       regulator-always-on;
-                                       regulator-min-microvolt = <2050000>;
-                                       regulator-max-microvolt = <2050000>;
-                                       qcom,switch-mode-frequency = <1600000>;
-                                       bias-pull-down;
-                               };
-
-                               /* PMOS LDO */
-                               pm8921_l1: l1 {
-                                       regulator-always-on;
-                                       regulator-min-microvolt = <1050000>;
-                                       regulator-max-microvolt = <1050000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_l2: l2 {
-                                       regulator-min-microvolt = <1200000>;
-                                       regulator-max-microvolt = <1200000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_l3: l3 {
-                                       regulator-min-microvolt = <3075000>;
-                                       regulator-max-microvolt = <3075000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_l4: l4 {
-                                       regulator-always-on;
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_l5: l5 {
-                                       regulator-min-microvolt = <2950000>;
-                                       regulator-max-microvolt = <2950000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_l6: l6 {
-                                       regulator-min-microvolt = <2950000>;
-                                       regulator-max-microvolt = <2950000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_l7: l7 {
-                                       regulator-always-on;
-                                       regulator-min-microvolt = <1850000>;
-                                       regulator-max-microvolt = <2950000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_l8: l8 {
-                                       regulator-min-microvolt = <2800000>;
-                                       regulator-max-microvolt = <3000000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_l9: l9 {
-                                       regulator-min-microvolt = <3000000>;
-                                       regulator-max-microvolt = <3000000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_l10: l10 {
-                                       regulator-min-microvolt = <3000000>;
-                                       regulator-max-microvolt = <3000000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_l11: l11 {
-                                       regulator-min-microvolt = <2850000>;
-                                       regulator-max-microvolt = <2850000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_l12: l12 {
-                                       regulator-min-microvolt = <1200000>;
-                                       regulator-max-microvolt = <1200000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_l14: l14 {
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_l15: l15 {
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <2950000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_l16: l16 {
-                                       regulator-min-microvolt = <2800000>;
-                                       regulator-max-microvolt = <2800000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_l17: l17 {
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <2950000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_l18: l18 {
-                                       regulator-min-microvolt = <1300000>;
-                                       regulator-max-microvolt = <1300000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_l21: l21 {
-                                       regulator-min-microvolt = <1900000>;
-                                       regulator-max-microvolt = <1900000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_l22: l22 {
-                                       regulator-min-microvolt = <2750000>;
-                                       regulator-max-microvolt = <2750000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_l23: l23 {
-                                       regulator-always-on;
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_l24: l24 {
-                                       regulator-min-microvolt = <750000>;
-                                       regulator-max-microvolt = <1150000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8921_l25: l25 {
-                                       regulator-always-on;
-                                       regulator-min-microvolt = <1250000>;
-                                       regulator-max-microvolt = <1250000>;
-                                       bias-pull-down;
-                               };
-
-                               /* Low Voltage Switch */
-                               pm8921_lvs1: lvs1 {
-                                       bias-pull-down;
-                               };
-
-                               pm8921_lvs2: lvs2 {
-                                       bias-pull-down;
-                               };
-
-                               pm8921_lvs3: lvs3 {
-                                       bias-pull-down;
-                               };
-
-                               pm8921_lvs4: lvs4 {
-                                       bias-pull-down;
-                               };
-
-                               pm8921_lvs5: lvs5 {
-                                       bias-pull-down;
-                               };
-
-                               pm8921_lvs6: lvs6 {
-                                       bias-pull-down;
-                               };
-
-                               pm8921_lvs7: lvs7 {
-                                       bias-pull-down;
-                               };
-
-                               pm8921_ncp: ncp {
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                                       qcom,switch-mode-frequency = <1600000>;
-                               };
-                       };
-               };
-
-               gsbi@16000000 {
-                       status = "okay";
-                       qcom,mode = <GSBI_PROT_SPI>;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&spi1_default>;
-                       spi@16080000 {
-                               status = "okay";
-                               ethernet@0 {
-                                       compatible = "micrel,ks8851";
-                                       reg = <0>;
-                                       interrupt-parent = <&msmgpio>;
-                                       interrupts = <90 8>;
-                                       spi-max-frequency = <5400000>;
-                                       vdd-supply = <&ext_l2>;
-                                       vdd-io-supply = <&pm8921_lvs6>;
-                                       reset-gpios = <&msmgpio 89 0>;
-                               };
-                       };
-               };
-
-               pinctrl@800000 {
-                       spi1_default: spi1_default {
-                               mux {
-                                       pins = "gpio6", "gpio7", "gpio9";
-                                       function = "gsbi1";
-                               };
-
-                               mosi {
-                                       pins = "gpio6";
-                                       drive-strength = <12>;
-                                       bias-disable;
-                               };
-
-                               miso {
-                                       pins = "gpio7";
-                                       drive-strength = <12>;
-                                       bias-disable;
-                               };
-
-                               cs {
-                                       pins = "gpio8";
-                                       drive-strength = <12>;
-                                       bias-disable;
-                                       output-low;
-                               };
-
-                               clk {
-                                       pins = "gpio9";
-                                       drive-strength = <12>;
-                                       bias-disable;
-                               };
-                       };
-               };
-       };
-
        regulators {
                compatible = "simple-bus";
 
@@ -340,6 +28,71 @@
        };
 };
 
+&gsbi1 {
+       qcom,mode = <GSBI_PROT_SPI>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&spi1_default>;
+       status = "okay";
+};
+
+&gsbi1_spi {
+       status = "okay";
+
+       ethernet@0 {
+               compatible = "micrel,ks8851";
+               reg = <0>;
+               interrupt-parent = <&msmgpio>;
+               interrupts = <90 8>;
+               spi-max-frequency = <5400000>;
+               vdd-supply = <&ext_l2>;
+               vdd-io-supply = <&pm8921_lvs6>;
+               reset-gpios = <&msmgpio 89 0>;
+       };
+};
+
+&gsbi5 {
+       qcom,mode = <GSBI_PROT_I2C_UART>;
+       status = "okay";
+};
+
+&gsbi5_serial {
+       status = "okay";
+};
+
+&msmgpio {
+       spi1_default: spi1_default {
+                mux {
+                       pins = "gpio6", "gpio7", "gpio9";
+                       function = "gsbi1";
+                };
+
+                mosi {
+                       pins = "gpio6";
+                       drive-strength = <12>;
+                       bias-disable;
+                };
+
+                miso {
+                       pins = "gpio7";
+                       drive-strength = <12>;
+                       bias-disable;
+                };
+
+                cs {
+                       pins = "gpio8";
+                       drive-strength = <12>;
+                       bias-disable;
+                       output-low;
+                };
+
+                clk {
+                       pins = "gpio9";
+                       drive-strength = <12>;
+                       bias-disable;
+                };
+       };
+};
+
 &pmicintc {
        keypad@148 {
                linux,keymap = <
@@ -352,3 +105,249 @@
                keypad,num-columns = <5>;
        };
 };
+
+&rpm {
+       regulators {
+               compatible = "qcom,rpm-pm8921-regulators";
+               vin_lvs1_3_6-supply = <&pm8921_s4>;
+               vin_lvs2-supply = <&pm8921_s4>;
+               vin_lvs4_5_7-supply = <&pm8921_s4>;
+               vdd_ncp-supply = <&pm8921_l6>;
+               vdd_l1_l2_l12_l18-supply = <&pm8921_s4>;
+               vdd_l21_l23_l29-supply = <&pm8921_s8>;
+               vdd_l24-supply = <&pm8921_s1>;
+               vdd_l25-supply = <&pm8921_s1>;
+               vdd_l27-supply = <&pm8921_s7>;
+               vdd_l28-supply = <&pm8921_s7>;
+
+               /* Buck SMPS */
+               pm8921_s1: s1 {
+                       regulator-always-on;
+                       regulator-min-microvolt = <1225000>;
+                       regulator-max-microvolt = <1225000>;
+                       qcom,switch-mode-frequency = <3200000>;
+                       bias-pull-down;
+               };
+
+               pm8921_s2: s2 {
+                       regulator-min-microvolt = <1300000>;
+                       regulator-max-microvolt = <1300000>;
+                       qcom,switch-mode-frequency = <1600000>;
+                       bias-pull-down;
+               };
+
+               pm8921_s3: s3 {
+                       regulator-min-microvolt = <500000>;
+                       regulator-max-microvolt = <1150000>;
+                       qcom,switch-mode-frequency = <4800000>;
+                       bias-pull-down;
+               };
+
+               pm8921_s4: s4 {
+                       regulator-always-on;
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       qcom,switch-mode-frequency = <1600000>;
+                       bias-pull-down;
+                       qcom,force-mode = <QCOM_RPM_FORCE_MODE_AUTO>;
+               };
+
+               pm8921_s7: s7 {
+                       regulator-min-microvolt = <1150000>;
+                       regulator-max-microvolt = <1150000>;
+                       qcom,switch-mode-frequency = <3200000>;
+                       bias-pull-down;
+               };
+
+               pm8921_s8: s8 {
+                       regulator-always-on;
+                       regulator-min-microvolt = <2050000>;
+                       regulator-max-microvolt = <2050000>;
+                       qcom,switch-mode-frequency = <1600000>;
+                       bias-pull-down;
+               };
+
+               /* PMOS LDO */
+               pm8921_l1: l1 {
+                       regulator-always-on;
+                       regulator-min-microvolt = <1050000>;
+                       regulator-max-microvolt = <1050000>;
+                       bias-pull-down;
+               };
+
+               pm8921_l2: l2 {
+                       regulator-min-microvolt = <1200000>;
+                       regulator-max-microvolt = <1200000>;
+                       bias-pull-down;
+               };
+
+               pm8921_l3: l3 {
+                       regulator-min-microvolt = <3075000>;
+                       regulator-max-microvolt = <3075000>;
+                       bias-pull-down;
+               };
+
+               pm8921_l4: l4 {
+                       regulator-always-on;
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       bias-pull-down;
+               };
+
+               pm8921_l5: l5 {
+                       regulator-min-microvolt = <2950000>;
+                       regulator-max-microvolt = <2950000>;
+                       bias-pull-down;
+               };
+
+               pm8921_l6: l6 {
+                       regulator-min-microvolt = <2950000>;
+                       regulator-max-microvolt = <2950000>;
+                       bias-pull-down;
+               };
+
+               pm8921_l7: l7 {
+                       regulator-always-on;
+                       regulator-min-microvolt = <1850000>;
+                       regulator-max-microvolt = <2950000>;
+                       bias-pull-down;
+               };
+
+               pm8921_l8: l8 {
+                       regulator-min-microvolt = <2800000>;
+                       regulator-max-microvolt = <3000000>;
+                       bias-pull-down;
+               };
+
+               pm8921_l9: l9 {
+                       regulator-min-microvolt = <3000000>;
+                       regulator-max-microvolt = <3000000>;
+                       bias-pull-down;
+               };
+
+               pm8921_l10: l10 {
+                       regulator-min-microvolt = <3000000>;
+                       regulator-max-microvolt = <3000000>;
+                       bias-pull-down;
+               };
+
+               pm8921_l11: l11 {
+                       regulator-min-microvolt = <2850000>;
+                       regulator-max-microvolt = <2850000>;
+                       bias-pull-down;
+               };
+
+               pm8921_l12: l12 {
+                       regulator-min-microvolt = <1200000>;
+                       regulator-max-microvolt = <1200000>;
+                       bias-pull-down;
+               };
+
+               pm8921_l14: l14 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       bias-pull-down;
+               };
+
+               pm8921_l15: l15 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <2950000>;
+                       bias-pull-down;
+               };
+
+               pm8921_l16: l16 {
+                       regulator-min-microvolt = <2800000>;
+                       regulator-max-microvolt = <2800000>;
+                       bias-pull-down;
+               };
+
+               pm8921_l17: l17 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <2950000>;
+                       bias-pull-down;
+               };
+
+               pm8921_l18: l18 {
+                       regulator-min-microvolt = <1300000>;
+                       regulator-max-microvolt = <1300000>;
+                       bias-pull-down;
+               };
+
+               pm8921_l21: l21 {
+                       regulator-min-microvolt = <1900000>;
+                       regulator-max-microvolt = <1900000>;
+                       bias-pull-down;
+               };
+
+               pm8921_l22: l22 {
+                       regulator-min-microvolt = <2750000>;
+                       regulator-max-microvolt = <2750000>;
+                       bias-pull-down;
+               };
+
+               pm8921_l23: l23 {
+                       regulator-always-on;
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       bias-pull-down;
+               };
+
+               pm8921_l24: l24 {
+                       regulator-min-microvolt = <750000>;
+                       regulator-max-microvolt = <1150000>;
+                       bias-pull-down;
+               };
+
+               pm8921_l25: l25 {
+                       regulator-always-on;
+                       regulator-min-microvolt = <1250000>;
+                       regulator-max-microvolt = <1250000>;
+                       bias-pull-down;
+               };
+
+               /* Low Voltage Switch */
+               pm8921_lvs1: lvs1 {
+                       bias-pull-down;
+               };
+
+               pm8921_lvs2: lvs2 {
+                       bias-pull-down;
+               };
+
+               pm8921_lvs3: lvs3 {
+                       bias-pull-down;
+               };
+
+               pm8921_lvs4: lvs4 {
+                       bias-pull-down;
+               };
+
+               pm8921_lvs5: lvs5 {
+                       bias-pull-down;
+               };
+
+               pm8921_lvs6: lvs6 {
+                       bias-pull-down;
+               };
+
+               pm8921_lvs7: lvs7 {
+                       bias-pull-down;
+               };
+
+               pm8921_ncp: ncp {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       qcom,switch-mode-frequency = <1600000>;
+               };
+       };
+};
+
+/* eMMC */
+&sdcc1 {
+       status = "okay";
+};
+
+/* External micro SD card */
+&sdcc3 {
+       status = "okay";
+};

diff --git a/arch/arm/boot/dts/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom-msm8960.dtsi
index 19554f3..a5f1eda 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8960.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8960.dtsi
@@ -152,7 +152,7 @@
                        reg = <0x2011000 0x1000>;
                };
 
-               rpm@108000 {
+               rpm: rpm@108000 {
                        compatible = "qcom,rpm-msm8960";
                        reg = <0x108000 0x1000>;
                        qcom,ipc = <&l2cc 0x8 2>;
@@ -307,7 +307,7 @@
                        reg = <0x1a400000 0x100>;
                };
 
-               gsbi@16000000 {
+               gsbi1: gsbi@16000000 {
                        compatible = "qcom,gsbi-v1.0.0";
                        cell-index = <1>;
                        reg = <0x16000000 0x100>;
@@ -317,7 +317,7 @@
                        #size-cells = <1>;
                        ranges;
 
-                       spi@16080000 {
+                       gsbi1_spi: spi@16080000 {
                                compatible = "qcom,spi-qup-v1.1.1";
                                #address-cells = <1>;
                                #size-cells = <0>;