msm: 8660: Additional code to enable Ion
Correct the macro for the SMI size and remove the pmem devices.
Change-Id: I153a0d3ba904ebb5a66efb808fc7850a645fa9b7
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
index d891fdf..d3d5ffa 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -2630,7 +2630,7 @@
#define MSM_ION_EBI_SIZE MSM_PMEM_SF_SIZE
#define MSM_ION_ADSP_SIZE MSM_PMEM_ADSP_SIZE
-#define MSM_ION_SMI_SIZE MSM_USER_SMI_SIZE
+#define MSM_ION_SMI_SIZE MSM_PMEM_SMIPOOL_SIZE
#ifdef CONFIG_MSM_MULTIMEDIA_USE_ION
#define MSM_ION_HEAP_NUM 5
@@ -4157,11 +4157,13 @@
&msm_device_ssbi3,
#endif
#ifdef CONFIG_ANDROID_PMEM
+#ifndef CONFIG_MSM_MULTIMEDIA_USE_ION
&android_pmem_device,
&android_pmem_adsp_device,
- &android_pmem_audio_device,
&android_pmem_smipool_device,
#endif
+ &android_pmem_audio_device,
+#endif
#ifdef CONFIG_MSM_ROTATOR
&msm_rotator_device,
#endif