arm64: dts: add spmi prefix to regulators

This patch adds prefix to spmi regulators so that it does not conflict
with the smd based regulators.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 9a27d5aefb8a985ecfa7f7889823d9b4be3d7893..a7024deaf3a1b14dfec10c1ad7da6d8d363dfb26 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -95,7 +95,7 @@
                        next-level-cache = <&L2_0>;
                        clocks = <&a53cc 1>;
                        clock-latency = <200000>;
-                       cpu-supply = <&pm8916_s2>;
+                       cpu-supply = <&pm8916_spmi_s2>;
                        /* cooling options */
                        cooling-min-level = <0>;
                        cooling-max-level = <7>;
@@ -116,7 +116,7 @@
                        next-level-cache = <&L2_0>;
                        clocks = <&a53cc 1>;
                        clock-latency = <200000>;
-                       cpu-supply = <&pm8916_s2>;
+                       cpu-supply = <&pm8916_spmi_s2>;
                        /* cooling options */
                        cooling-min-level = <0>;
                        cooling-max-level = <7>;
@@ -132,7 +132,7 @@
                        next-level-cache = <&L2_0>;
                        clocks = <&a53cc 1>;
                        clock-latency = <200000>;
-                       cpu-supply = <&pm8916_s2>;
+                       cpu-supply = <&pm8916_spmi_s2>;
                        /* cooling options */
                        cooling-min-level = <0>;
                        cooling-max-level = <7>;
@@ -148,7 +148,7 @@
                        next-level-cache = <&L2_0>;
                        clocks = <&a53cc 1>;
                        clock-latency = <200000>;
-                       cpu-supply = <&pm8916_s2>;
+                       cpu-supply = <&pm8916_spmi_s2>;
                        /* cooling options */
                        cooling-min-level = <0>;
                        cooling-max-level = <7>;

diff --git a/arch/arm64/boot/dts/qcom/pm8916.dtsi b/arch/arm64/boot/dts/qcom/pm8916.dtsi
index 733c036b027699ecec7627b4c63e11f4da760c9c..fcc9303da10056441852a54a0acaffa70535485c 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8916.dtsi
@@ -110,7 +110,7 @@
                                status = "disabled";
                        };
 
-                       pm8916_s2: s2@1700 {
+                       pm8916_spmi_s2: s2@1700 {
                                reg = <0x1700 0x300>;
                                status = "ok";
                                regulator-min-microvolt = <1050000>;