aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAjay Dudani <adudani@google.com>2016-05-23 10:27:04 -0700
committerAjay Dudani <adudani@google.com>2016-05-23 17:33:43 +0000
commit927b37a7a09d15515044fbb7405336f54dbbd779 (patch)
tree15ccdac81e00b868b2c7aa0d1e82e413b19d4aad
parent0fb021096a18f9b4f5c68b0f22eb06bb41b2fec6 (diff)
msm8916: cma: Drop secure memory buffersandroid-n-preview-4_r0.9
seed does not support widevine level 1, nor wfd; drop these CMA secure buffers to reclaim memory. Change-Id: I5b3404a8433ee5ee8e5753b4f81b3aab7af1c03f Signed-off-by: Ajay Dudani <adudani@google.com>
-rw-r--r--arch/arm/boot/dts/qcom/msm8916-ion.dtsi8
-rw-r--r--arch/arm/boot/dts/qcom/msm8916-memory.dtsi6
2 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8916-ion.dtsi b/arch/arm/boot/dts/qcom/msm8916-ion.dtsi
index 80baf241df41..3c1c5f7d0fa6 100644
--- a/arch/arm/boot/dts/qcom/msm8916-ion.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8916-ion.dtsi
@@ -26,14 +26,6 @@
qcom,ion-heap-type = "SYSTEM_CONTIG";
};
- qcom,ion-heap@8 { /* CP_MM HEAP */
- compatible = "qcom,msm-ion-reserve";
- reg = <8>;
- qcom,heap-align = <0x1000>;
- linux,contiguous-region = <&secure_mem>;
- qcom,ion-heap-type = "SECURE_DMA";
- };
-
qcom,ion-heap@27 { /* QSEECOM HEAP */
compatible = "qcom,msm-ion-reserve";
reg = <27>;
diff --git a/arch/arm/boot/dts/qcom/msm8916-memory.dtsi b/arch/arm/boot/dts/qcom/msm8916-memory.dtsi
index f49537a19449..2e1af1eb57c7 100644
--- a/arch/arm/boot/dts/qcom/msm8916-memory.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8916-memory.dtsi
@@ -41,12 +41,6 @@
label = "peripheral_mem";
};
- secure_mem: secure_region@0 {
- linux,reserve-contiguous-region;
- reg = <0 0 0 0x6D00000>;
- label = "secure_mem";
- };
-
venus_qseecom_mem: venus_qseecom_region@0 {
linux,reserve-contiguous-region;
linux,memory-limit = <0x90000000>;