summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-05-24 02:46:41 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-05-24 02:46:41 -0700
commitf485daa540f1c3f44450725dabd4acf3e9ef1986 (patch)
tree14f74e780f7f73baac9063ab83ef32d0e8956050 /arch
parent2ed9c4ea737042461709358350b4e260dec1419e (diff)
parenta386587650db47bd1fc9c5f36c38300b2037c6ca (diff)
Merge "ARM: dts: msm: remove modem region reserved on APQ8096 ADP"
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts3
-rw-r--r--arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts4
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts
index e4eca6aed98b..4648d2000d01 100644
--- a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts
+++ b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts
@@ -97,6 +97,3 @@
};
};
-&modem_mem {
- status = "disabled";
-};
diff --git a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts
index 39ec8d4cb591..d0758aeacb6f 100644
--- a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts
+++ b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts
@@ -82,10 +82,6 @@
};
};
-&modem_mem {
- status = "disabled";
-};
-
&wil6210 {
qcom,pcie-parent = <&pcie0>;
qcom,smmu-support;