ARM: dts: qcom: msm8660: fix PMIC node labels

[ Upstream commit c6d86aa8a12194d1c9c2f9108910a46c8a3ddc90 ]

Change PM8058 node labels to start with pm8058_ prefix, following other
Qualcomm PMIC device nodes.

Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20230928110309.1212221-11-dmitry.baryshkov@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts b/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts
index db4c791..48fd1a1 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts
@@ -72,7 +72,7 @@
                /* Trig on both edges - getting close or far away */
                interrupts-extended = <&pm8058_gpio 34 IRQ_TYPE_EDGE_BOTH>;
                /* MPP05 analog input to the XOADC */
-               io-channels = <&xoadc 0x00 0x05>;
+               io-channels = <&pm8058_xoadc 0x00 0x05>;
                io-channel-names = "aout";
                pinctrl-names = "default";
                pinctrl-0 = <&dragon_cm3605_gpios>, <&dragon_cm3605_mpps>;
@@ -945,7 +945,7 @@
        };
 };
 
-&xoadc {
+&pm8058_xoadc {
        /* Reference voltage 2.2 V */
        xoadc-ref-supply = <&pm8058_l18>;
 

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi
index 78023ed..9217ced 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi
@@ -80,13 +80,13 @@
         */
        iio-hwmon {
                compatible = "iio-hwmon";
-               io-channels = <&xoadc 0x00 0x01>, /* Battery */
-                           <&xoadc 0x00 0x02>, /* DC in (charger) */
-                           <&xoadc 0x00 0x04>, /* VPH the main system voltage */
-                           <&xoadc 0x00 0x0b>, /* Die temperature */
-                           <&xoadc 0x00 0x0c>, /* Reference voltage 1.25V */
-                           <&xoadc 0x00 0x0d>, /* Reference voltage 0.625V */
-                           <&xoadc 0x00 0x0e>; /* Reference voltage 0.325V */
+               io-channels = <&pm8058_xoadc 0x00 0x01>, /* Battery */
+                             <&pm8058_xoadc 0x00 0x02>, /* DC in (charger) */
+                             <&pm8058_xoadc 0x00 0x04>, /* VPH the main system voltage */
+                             <&pm8058_xoadc 0x00 0x0b>, /* Die temperature */
+                             <&pm8058_xoadc 0x00 0x0c>, /* Reference voltage 1.25V */
+                             <&pm8058_xoadc 0x00 0x0d>, /* Reference voltage 0.625V */
+                             <&pm8058_xoadc 0x00 0x0e>; /* Reference voltage 0.325V */
        };
 
        soc: soc {
@@ -390,7 +390,7 @@
                                        row-hold = <91500>;
                                };
 
-                               xoadc: xoadc@197 {
+                               pm8058_xoadc: xoadc@197 {
                                        compatible = "qcom,pm8058-adc";
                                        reg = <0x197>;
                                        interrupts-extended = <&pm8058 76 IRQ_TYPE_EDGE_RISING>;