Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "ARM: dts: msm: Have adsp heap use secure memory CMA pool for 8992"

This commit is contained in:
Linux Build Service Account 2015-01-21 15:38:16 -08:00 committed by Gerrit - the friendly Code Review server
parent c2f3455dd2 d65a9e913b
commit 3fc4ced6ce
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/qcom/msm8992-ion.dtsi
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@ -37,7 +37,7 @@
qcom,ion-heap@22 { /* adsp heap */
reg = <22>;
linux,contiguous-region = <&adsp_mem>;
linux,contiguous-region = <&secure_mem>;
qcom,ion-heap-type = "DMA";
};

12
arch/arm/boot/dts/qcom/msm8992.dtsi
View File

@ -205,12 +205,6 @@
label = "secure_mem";
};
adsp_mem: adsp_region@0 {
linux,reserve-contiguous-region;
reg = <0 0 0 0x300000>;
label = "adsp_mem";
};
qsecom_mem: qsecom_region@0 {
linux,reserve-contiguous-region;
reg = <0 0 0 0x1800000>;
@ -1662,7 +1656,7 @@
reg = <0x00000000 0x00010000>;
reg-names = "rfsa_dsp";
qcom,client-id = <0x011013ec>;
linux,contiguous-region = <&adsp_mem>;
linux,contiguous-region = <&secure_mem>;
};
qcom,mdm_sharedmem@00000000 {
@ -1677,7 +1671,7 @@
reg = <0x00000000 0x00010000>;
reg-names = "rfsa_sensor";
qcom,client-id = <0x011013ee>;
linux,contiguous-region = <&adsp_mem>;
linux,contiguous-region = <&secure_mem>;
};
qcom,venus@fdce0000 {
@ -2778,7 +2772,7 @@
adsp_heap {
compatible = "qcom,msm-shared-memory";
qcom,proc-id = <1>;
linux,contiguous-region = <&adsp_mem>;
linux,contiguous-region = <&secure_mem>;
};
qcom,msm-ssc-sensors {