arm64: dts: qcom: ipq6018: move mp5496 regulator out of soc dtsi

Some IPQ60xx SoCs don't come with the mp5496 pmic chip. The mp5496
pmic was never part of the IPQ60xx SoC, it's optional, so we moved
it out of the soc dtsi.

Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20250210070122.208842-4-amadeus@jmu.edu.cn
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts b/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts
index f5f4827c0e1770e7831715c2ec1b9c63df794cb9..9c69d3027b43feddcda63bfcc1d17249a2af91da 100644 (file)
--- a/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts
+++ b/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts
@@ -7,7 +7,7 @@
 
 /dts-v1/;
 
-#include "ipq6018.dtsi"
+#include "ipq6018-mp5496.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. IPQ6018/AP-CP01-C1";

diff --git a/arch/arm64/boot/dts/qcom/ipq6018-mp5496.dtsi b/arch/arm64/boot/dts/qcom/ipq6018-mp5496.dtsi
new file mode 100644 (file)
index 0000000..fe2152d
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/ipq6018-mp5496.dtsi
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+/*
+ * ipq6018-mp5496.dtsi describes common properties (e.g. regulators) that
+ * apply to most devices that make use of the IPQ6018 SoC and MP5496 PMIC.
+ */
+
+#include "ipq6018.dtsi"
+
+&cpu0 {
+       cpu-supply = <&ipq6018_s2>;
+};
+
+&cpu1 {
+       cpu-supply = <&ipq6018_s2>;
+};
+
+&cpu2 {
+       cpu-supply = <&ipq6018_s2>;
+};
+
+&cpu3 {
+       cpu-supply = <&ipq6018_s2>;
+};
+
+&rpm_requests {
+       regulators {
+               compatible = "qcom,rpm-mp5496-regulators";
+
+               ipq6018_s2: s2 {
+                       regulator-min-microvolt = <725000>;
+                       regulator-max-microvolt = <1062500>;
+                       regulator-always-on;
+               };
+       };
+};

diff --git a/arch/arm64/boot/dts/qcom/ipq6018.dtsi b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
index 7514919132b6bdb4ceda311a0d29abf33b71663e..a02aa641cb9081a1b62b387d961c5adcf37cb3ba 100644 (file)
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -43,7 +43,6 @@
                        clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
                        clock-names = "cpu";
                        operating-points-v2 = <&cpu_opp_table>;
-                       cpu-supply = <&ipq6018_s2>;
                        #cooling-cells = <2>;
                };
 
@@ -56,7 +55,6 @@
                        clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
                        clock-names = "cpu";
                        operating-points-v2 = <&cpu_opp_table>;
-                       cpu-supply = <&ipq6018_s2>;
                        #cooling-cells = <2>;
                };
 
@@ -69,7 +67,6 @@
                        clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
                        clock-names = "cpu";
                        operating-points-v2 = <&cpu_opp_table>;
-                       cpu-supply = <&ipq6018_s2>;
                        #cooling-cells = <2>;
                };
 
@@ -82,7 +79,6 @@
                        clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
                        clock-names = "cpu";
                        operating-points-v2 = <&cpu_opp_table>;
-                       cpu-supply = <&ipq6018_s2>;
                        #cooling-cells = <2>;
                };
 
@@ -184,16 +180,6 @@
                        rpm_requests: rpm-requests {
                                compatible = "qcom,rpm-ipq6018", "qcom,glink-smd-rpm";
                                qcom,glink-channels = "rpm_requests";
-
-                               regulators {
-                                       compatible = "qcom,rpm-mp5496-regulators";
-
-                                       ipq6018_s2: s2 {
-                                               regulator-min-microvolt = <725000>;
-                                               regulator-max-microvolt = <1062500>;
-                                               regulator-always-on;
-                                       };
-                               };
                        };
                };
        };