arm64: dts: qcom: msm8996-sony-xperia-tone: fix SPMI regulators declaration

Device tree for the Sony Xperia tone family of devices specifies
S9+S10+S11 SAW regulator as a part of the pmi8994_spmi_regulators device
tree node. However PMI8994 does not have these regulators, they are part
of the PM8994 device. All other MSM8996-based devices list them in the
pm8994_spmi_regulators device tree node. Move them accordingly.

Cc: AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20211104002949.2204727-5-dmitry.baryshkov@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
index ff7f39d..137b2d1 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
@@ -589,34 +589,37 @@
        };
 };
 
-&pmi8994_spmi_regulators {
+&pm8994_spmi_regulators {
        qcom,saw-reg = <&saw3>;
 
-       vdd_gfx:
-       pmi8994_s2: s2 {
-               /* Pinned to a high value for now to avoid random crashes. */
-               regulator-min-microvolt = <1015000>;
-               regulator-max-microvolt = <1015000>;
-               regulator-name = "vdd_gfx";
-               regulator-always-on;
-       };
-
-       pmi8994_s9: s9 {
+       pm8994_s9: s9 {
                qcom,saw-slave;
        };
 
-       pmi8994_s10: s10 {
+       pm8994_s10: s10 {
                qcom,saw-slave;
        };
 
-       pmi8994_s11: s11 {
+       pm8994_s11: s11 {
                qcom,saw-leader;
+               regulator-name = "vdd_apcc";
                regulator-always-on;
                regulator-min-microvolt = <470000>;
                regulator-max-microvolt = <1140000>;
        };
 };
 
+&pmi8994_spmi_regulators {
+       vdd_gfx:
+       pmi8994_s2: s2 {
+               /* Pinned to a high value for now to avoid random crashes. */
+               regulator-min-microvolt = <1015000>;
+               regulator-max-microvolt = <1015000>;
+               regulator-name = "vdd_gfx";
+               regulator-always-on;
+       };
+};
+
 &pmi8994_wled {
        status = "okay";
        default-brightness = <512>;