arm/dt: msm8974: Add labels spmi_bus and rpm_bus
Add labels spmi_bus and rpm_bus to the devices qcom,spmi@fc4c0000
and qcom,rpm-smd respectively. Replace the appropriate addresses in the
related files by the corresponding labels. Remove the address
dependencies in the dtsi files, and therefore, remove the platform
dependency. Change only the address in the label for a given platform.
Change-Id: Ib93af7f6fc5bdf0da2ddb2fa7aabde0de0c87e6e
Signed-off-by: Varad Deshmukh <varadd@codeaurora.org>
diff --git a/arch/arm/boot/dts/msm8974-gpio.dtsi b/arch/arm/boot/dts/msm8974-gpio.dtsi
index 59ad8db..323fac4 100644
--- a/arch/arm/boot/dts/msm8974-gpio.dtsi
+++ b/arch/arm/boot/dts/msm8974-gpio.dtsi
@@ -10,225 +10,223 @@
* GNU General Public License for more details.
*/
-/ {
- qcom,spmi@fc4c0000 {
+&spmi_bus {
- qcom,pm8941@0 {
+ qcom,pm8941@0 {
- pm8941_gpios: pm8941_gpios {
+ pm8941_gpios: pm8941_gpios {
- gpio@c000 {
- status = "ok";
- };
-
- gpio@c100 {
- status = "ok";
- };
-
- gpio@c200 {
- status = "ok";
- };
-
- gpio@c300 {
- status = "ok";
- };
-
- gpio@c400 {
- status = "ok";
- };
-
- gpio@c500 {
- status = "ok";
- };
-
- gpio@c600 {
- status = "ok";
- };
-
- gpio@c700 {
- status = "ok";
- };
-
- gpio@c800 {
- status = "ok";
- };
-
- gpio@c900 {
- status = "ok";
- };
-
- gpio@ca00 {
- status = "ok";
- };
-
- gpio@cb00 {
- status = "ok";
- };
-
- gpio@cc00 {
- status = "ok";
- };
-
- gpio@cd00 {
- status = "ok";
- };
-
- gpio@ce00 {
- status = "ok";
- };
-
- gpio@cf00 {
- status = "ok";
- };
-
- gpio@d000 {
- status = "ok";
- };
-
- gpio@d100 {
- status = "ok";
- };
-
- gpio@d200 {
- status = "ok";
- };
-
- gpio@d300 {
- status = "ok";
- };
-
- gpio@d400 {
- status = "ok";
- };
-
- gpio@d500 {
- status = "ok";
- };
-
- gpio@d600 {
- status = "ok";
- };
-
- gpio@d700 {
- status = "ok";
- };
-
- gpio@d800 {
- qcom,out-strength = <1>;
- status = "ok";
- };
-
- gpio@d900 {
- qcom,out-strength = <1>;
- status = "ok";
- };
-
- gpio@da00 {
- qcom,out-strength = <1>;
- status = "ok";
- };
-
- gpio@db00 {
- qcom,out-strength = <1>;
- status = "ok";
- };
-
- gpio@dc00 {
- qcom,out-strength = <1>;
- status = "ok";
- };
-
- gpio@dd00 {
- qcom,out-strength = <1>;
- status = "ok";
- };
-
- gpio@de00 {
- qcom,out-strength = <1>;
- status = "ok";
- };
-
- gpio@df00 {
- qcom,out-strength = <1>;
- status = "ok";
- };
-
- gpio@e000 {
- qcom,out-strength = <1>;
- status = "ok";
- };
-
- gpio@e100 {
- qcom,out-strength = <1>;
- status = "ok";
- };
-
- gpio@e200 {
- qcom,out-strength = <1>;
- status = "ok";
- };
-
- gpio@e300 {
- qcom,out-strength = <1>;
- status = "ok";
- };
+ gpio@c000 {
+ status = "ok";
};
- pm8941_mpps: pm8941_mpps {
+ gpio@c100 {
+ status = "ok";
+ };
- mpp@a000 {
- status = "ok";
- };
+ gpio@c200 {
+ status = "ok";
+ };
- mpp@a100 {
- status = "ok";
- };
+ gpio@c300 {
+ status = "ok";
+ };
- mpp@a200 {
- status = "ok";
- };
+ gpio@c400 {
+ status = "ok";
+ };
- mpp@a300 {
- status = "ok";
- };
+ gpio@c500 {
+ status = "ok";
+ };
- mpp@a400 {
- status = "ok";
- };
+ gpio@c600 {
+ status = "ok";
+ };
- mpp@a500 {
- status = "ok";
- };
+ gpio@c700 {
+ status = "ok";
+ };
- mpp@a600 {
- status = "ok";
- };
+ gpio@c800 {
+ status = "ok";
+ };
- mpp@a700 {
- status = "ok";
- };
+ gpio@c900 {
+ status = "ok";
+ };
+
+ gpio@ca00 {
+ status = "ok";
+ };
+
+ gpio@cb00 {
+ status = "ok";
+ };
+
+ gpio@cc00 {
+ status = "ok";
+ };
+
+ gpio@cd00 {
+ status = "ok";
+ };
+
+ gpio@ce00 {
+ status = "ok";
+ };
+
+ gpio@cf00 {
+ status = "ok";
+ };
+
+ gpio@d000 {
+ status = "ok";
+ };
+
+ gpio@d100 {
+ status = "ok";
+ };
+
+ gpio@d200 {
+ status = "ok";
+ };
+
+ gpio@d300 {
+ status = "ok";
+ };
+
+ gpio@d400 {
+ status = "ok";
+ };
+
+ gpio@d500 {
+ status = "ok";
+ };
+
+ gpio@d600 {
+ status = "ok";
+ };
+
+ gpio@d700 {
+ status = "ok";
+ };
+
+ gpio@d800 {
+ qcom,out-strength = <1>;
+ status = "ok";
+ };
+
+ gpio@d900 {
+ qcom,out-strength = <1>;
+ status = "ok";
+ };
+
+ gpio@da00 {
+ qcom,out-strength = <1>;
+ status = "ok";
+ };
+
+ gpio@db00 {
+ qcom,out-strength = <1>;
+ status = "ok";
+ };
+
+ gpio@dc00 {
+ qcom,out-strength = <1>;
+ status = "ok";
+ };
+
+ gpio@dd00 {
+ qcom,out-strength = <1>;
+ status = "ok";
+ };
+
+ gpio@de00 {
+ qcom,out-strength = <1>;
+ status = "ok";
+ };
+
+ gpio@df00 {
+ qcom,out-strength = <1>;
+ status = "ok";
+ };
+
+ gpio@e000 {
+ qcom,out-strength = <1>;
+ status = "ok";
+ };
+
+ gpio@e100 {
+ qcom,out-strength = <1>;
+ status = "ok";
+ };
+
+ gpio@e200 {
+ qcom,out-strength = <1>;
+ status = "ok";
+ };
+
+ gpio@e300 {
+ qcom,out-strength = <1>;
+ status = "ok";
};
};
- qcom,pm8841@4 {
+ pm8941_mpps: pm8941_mpps {
- pm8841_mpps: pm8841_mpps {
+ mpp@a000 {
+ status = "ok";
+ };
- mpp@a000 {
- status = "ok";
- };
+ mpp@a100 {
+ status = "ok";
+ };
- mpp@a100 {
- status = "ok";
- };
+ mpp@a200 {
+ status = "ok";
+ };
- mpp@a200 {
- status = "ok";
- };
+ mpp@a300 {
+ status = "ok";
+ };
- mpp@a300 {
- status = "ok";
- };
+ mpp@a400 {
+ status = "ok";
+ };
+
+ mpp@a500 {
+ status = "ok";
+ };
+
+ mpp@a600 {
+ status = "ok";
+ };
+
+ mpp@a700 {
+ status = "ok";
+ };
+ };
+ };
+
+ qcom,pm8841@4 {
+
+ pm8841_mpps: pm8841_mpps {
+
+ mpp@a000 {
+ status = "ok";
+ };
+
+ mpp@a100 {
+ status = "ok";
+ };
+
+ mpp@a200 {
+ status = "ok";
+ };
+
+ mpp@a300 {
+ status = "ok";
};
};
};