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

[ Upstream commit 0e4688cd4ee6efbeae2b31f75e16961fd7f72735 ]

Change PM8018 node labels to start with pm8018_ 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-10-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-mdm9615-wp8548.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
index 92c8003..dac3aa7 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
@@ -76,7 +76,7 @@
        };
 };
 
-&pmicgpio {
+&pm8018_gpio {
        usb_vbus_5v_pins: usb-vbus-5v-state {
                pins = "gpio4";
                function = "normal";

diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
index 63e21aa..c0a60ba 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
@@ -261,7 +261,7 @@
                        reg = <0x500000 0x1000>;
                        qcom,controller-type = "pmic-arbiter";
 
-                       pmicintc: pmic {
+                       pm8018: pmic {
                                compatible = "qcom,pm8018", "qcom,pm8921";
                                interrupts = <GIC_PPI 226 IRQ_TYPE_LEVEL_HIGH>;
                                #interrupt-cells = <2>;
@@ -272,38 +272,38 @@
                                pwrkey@1c {
                                        compatible = "qcom,pm8018-pwrkey", "qcom,pm8921-pwrkey";
                                        reg = <0x1c>;
-                                       interrupt-parent = <&pmicintc>;
+                                       interrupt-parent = <&pm8018>;
                                        interrupts = <50 IRQ_TYPE_EDGE_RISING>,
                                                     <51 IRQ_TYPE_EDGE_RISING>;
                                        debounce = <15625>;
                                        pull-up;
                                };
 
-                               pmicmpp: mpps@50 {
+                               pm8018_mpps: mpps@50 {
                                        compatible = "qcom,pm8018-mpp", "qcom,ssbi-mpp";
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
                                        reg = <0x50>;
                                        gpio-controller;
                                        #gpio-cells = <2>;
-                                       gpio-ranges = <&pmicmpp 0 0 6>;
+                                       gpio-ranges = <&pm8018_mpps 0 0 6>;
                                };
 
                                rtc@11d {
                                        compatible = "qcom,pm8018-rtc", "qcom,pm8921-rtc";
-                                       interrupt-parent = <&pmicintc>;
+                                       interrupt-parent = <&pm8018>;
                                        interrupts = <39 IRQ_TYPE_EDGE_RISING>;
                                        reg = <0x11d>;
                                        allow-set-time;
                                };
 
-                               pmicgpio: gpio@150 {
+                               pm8018_gpio: gpio@150 {
                                        compatible = "qcom,pm8018-gpio", "qcom,ssbi-gpio";
                                        reg = <0x150>;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
                                        gpio-controller;
-                                       gpio-ranges = <&pmicgpio 0 0 6>;
+                                       gpio-ranges = <&pm8018_gpio 0 0 6>;
                                        #gpio-cells = <2>;
                                };
                        };