commit fbbf05b03a9694ab68b54ddec3f1346d701dfc19
author Olav Haugan <ohaugan@codeaurora.org> Thu Apr 05 14:33:41 2012 -0700
committer Linux Build Service Account <lnxbuild@localhost> Sat Apr 14 17:11:14 2012 -0600
tree 9d8965cb90a43e5c12fa886a0ecf384ca800b1bd
parent a786bea6cb5ef03fc3a7a47c6651122a186a497f

board: 8960: Increase QSECOM ION heap to 7.5MB

When IOMMU is enabled the SF heap is not needed anymore. QSECOM was
using this heap in addition to the QSECOM heap and QSECOM
cannot use the IOMMU heap and thus we need to increase the
QSECOM heap size.

Increase QSECOM ION heap to 7.5MB from 6MB only when IOMMU is
enabled.

Change-Id: I29b6128c60953b39557ada23e6a3b2ed526f2840
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>

arch/arm/mach-msm/board-8960.c

diff --git a/arch/arm/mach-msm/board-8960.c b/arch/arm/mach-msm/board-8960.c
index 4e95550..106d2ef 100644
--- a/arch/arm/mach-msm/board-8960.c
+++ b/arch/arm/mach-msm/board-8960.c
@@ -142,14 +142,15 @@
 #ifdef CONFIG_MSM_IOMMU
 #define MSM_ION_MM_SIZE            0x3800000
 #define MSM_ION_SF_SIZE            0x0
+#define MSM_ION_QSECOM_SIZE        0x780000 /* (7.5MB) */
 #define MSM_ION_HEAP_NUM	7
 #else
 #define MSM_ION_MM_SIZE            MSM_PMEM_ADSP_SIZE
 #define MSM_ION_SF_SIZE            MSM_PMEM_SIZE
+#define MSM_ION_QSECOM_SIZE        0x600000 /* (6MB) */
 #define MSM_ION_HEAP_NUM	8
 #endif
 #define MSM_ION_MM_FW_SIZE	0x200000 /* (2MB) */
-#define MSM_ION_QSECOM_SIZE	0x600000 /* (6MB) */
 #define MSM_ION_MFC_SIZE	SZ_8K
 #define MSM_ION_AUDIO_SIZE	MSM_PMEM_AUDIO_SIZE