Merge "arm/dt: msmcopper-sim: Add support for SDC2 slot" into msm-3.4
diff --git a/arch/arm/boot/dts/msmcopper-rumi.dts b/arch/arm/boot/dts/msmcopper-rumi.dts
index dff1973..3f1a2ac 100644
--- a/arch/arm/boot/dts/msmcopper-rumi.dts
+++ b/arch/arm/boot/dts/msmcopper-rumi.dts
@@ -38,14 +38,6 @@
qcom,sdcc-clk-rates = <400000 19200000>;
};
- qcom,sdcc@f9864000 {
- status = "disable";
- };
-
- qcom,sdcc@f98e4000 {
- status = "disable";
- };
-
qcom,sps@f998000 {
status = "disable";
};
diff --git a/arch/arm/boot/dts/msmcopper-sim.dts b/arch/arm/boot/dts/msmcopper-sim.dts
index ae3f2dd..ab6b8ba 100644
--- a/arch/arm/boot/dts/msmcopper-sim.dts
+++ b/arch/arm/boot/dts/msmcopper-sim.dts
@@ -17,22 +17,4 @@
/ {
model = "Qualcomm MSM Copper Simulator";
compatible = "qcom,msmcopper-sim", "qcom,msmcopper";
-
- qcom,sdcc@f9824000 {
- qcom,sdcc-disable_cmd23;
- };
-
- qcom,sdcc@f98a4000 {
- status = "disable";
- };
-
- qcom,sdcc@f9864000 {
- qcom,sdcc-clk-rates = <400000 25000000 50000000 100000000 200000000>;
- qcom,sdcc-sup-voltages = <2950 2950>;
- qcom,sdcc-disable_cmd23;
- };
-
- qcom,sdcc@f98e4000 {
- status = "disable";
- };
};
diff --git a/arch/arm/boot/dts/msmcopper.dtsi b/arch/arm/boot/dts/msmcopper.dtsi
index 60f59d3..87f63ff 100644
--- a/arch/arm/boot/dts/msmcopper.dtsi
+++ b/arch/arm/boot/dts/msmcopper.dtsi
@@ -111,6 +111,7 @@
qcom,sdcc-clk-rates = <400000 25000000 50000000 100000000>;
qcom,sdcc-sup-voltages = <1800 1800>;
qcom,sdcc-bus-width = <4>;
+ status = "disable";
};
qcom,sdcc@f98e4000 {
@@ -122,6 +123,7 @@
qcom,sdcc-clk-rates = <400000 25000000 50000000 100000000>;
qcom,sdcc-sup-voltages = <1800 1800>;
qcom,sdcc-bus-width = <4>;
+ status = "disable";
};
qcom,sps@f9980000 {