ENGR00140893-2 vpu: Add iram info to vpu platform data for each platform

Add iram info to vpu platform data for each platform in linux/arch folder.
Disable iram on MX51 and Enable iram on MX53 platforms.
And remove VPU_IRAM_SIZE usage.

Signed-off-by: Sammy He <r62914@freescale.com>

8 files changed, 12 insertions, 8 deletions

diff --git a/arch/arm/mach-mx5/mx51_3stack.c b/arch/arm/mach-mx5/mx51_3stack.c
index bb767af8ca4e..a516e877d90e 100644
--- a/arch/arm/mach-mx5/mx51_3stack.c
+++ b/arch/arm/mach-mx5/mx51_3stack.c
@@ -193,6 +193,8 @@ static struct mxc_ipu_config mxc_ipu_data = {
 
 extern void mx5_vpu_reset(void);
 static struct mxc_vpu_platform_data mxc_vpu_data = {
+	.iram_enable = false,
+	.iram_size = 0x14000,
 	.reset = mx5_vpu_reset,
 };
 
diff --git a/arch/arm/mach-mx5/mx51_babbage.c b/arch/arm/mach-mx5/mx51_babbage.c
index 52bcdbfbda04..bfae2d960223 100644
--- a/arch/arm/mach-mx5/mx51_babbage.c
+++ b/arch/arm/mach-mx5/mx51_babbage.c
@@ -342,6 +342,8 @@ static struct mxc_ipu_config mxc_ipu_data = {
 
 extern void mx5_vpu_reset(void);
 static struct mxc_vpu_platform_data mxc_vpu_data = {
+	.iram_enable = false,
+	.iram_size = 0x14000,
 	.reset = mx5_vpu_reset,
 };
 
diff --git a/arch/arm/mach-mx5/mx53_ard.c b/arch/arm/mach-mx5/mx53_ard.c
index 43dfa0ee89f2..0f28942ba317 100644
--- a/arch/arm/mach-mx5/mx53_ard.c
+++ b/arch/arm/mach-mx5/mx53_ard.c
@@ -491,6 +491,8 @@ static struct mxc_ipu_config mxc_ipu_data = {
 
 extern void mx5_vpu_reset(void);
 static struct mxc_vpu_platform_data mxc_vpu_data = {
+	.iram_enable = true,
+	.iram_size = 0x14000,
 	.reset = mx5_vpu_reset,
 };
 
diff --git a/arch/arm/mach-mx5/mx53_evk.c b/arch/arm/mach-mx5/mx53_evk.c
index f6c4b4f6e091..ebe96290e7ee 100644
--- a/arch/arm/mach-mx5/mx53_evk.c
+++ b/arch/arm/mach-mx5/mx53_evk.c
@@ -501,6 +501,8 @@ static struct mxc_ipu_config mxc_ipu_data = {
 
 extern void mx5_vpu_reset(void);
 static struct mxc_vpu_platform_data mxc_vpu_data = {
+	.iram_enable = true,
+	.iram_size = 0x14000,
 	.reset = mx5_vpu_reset,
 };
 
diff --git a/arch/arm/mach-mx5/mx53_loco.c b/arch/arm/mach-mx5/mx53_loco.c
index 4e57436758b0..417932812a4e 100644
--- a/arch/arm/mach-mx5/mx53_loco.c
+++ b/arch/arm/mach-mx5/mx53_loco.c
@@ -287,6 +287,8 @@ static struct mxc_ipu_config mxc_ipu_data = {
 
 extern void mx5_vpu_reset(void);
 static struct mxc_vpu_platform_data mxc_vpu_data = {
+	.iram_enable = true,
+	.iram_size = 0x14000,
 	.reset = mx5_vpu_reset,
 };
 
diff --git a/arch/arm/mach-mx5/mx53_smd.c b/arch/arm/mach-mx5/mx53_smd.c
index bcc3fe2a9693..75480c1182f2 100644
--- a/arch/arm/mach-mx5/mx53_smd.c
+++ b/arch/arm/mach-mx5/mx53_smd.c
@@ -449,6 +449,8 @@ static struct mxc_ipu_config mxc_ipu_data = {
 
 extern void mx5_vpu_reset(void);
 static struct mxc_vpu_platform_data mxc_vpu_data = {
+	.iram_enable = true,
+	.iram_size = 0x14000,
 	.reset = mx5_vpu_reset,
 };
 
diff --git a/arch/arm/plat-mxc/include/mach/mx35.h b/arch/arm/plat-mxc/include/mach/mx35.h
index 9dbe06d097c8..8d78c2fba47a 100644
--- a/arch/arm/plat-mxc/include/mach/mx35.h
+++ b/arch/arm/plat-mxc/include/mach/mx35.h
@@ -18,8 +18,6 @@
 #define SND_RAM_SIZE 0
 #endif
 
-#define VPU_IRAM_SIZE 0
-
 #define MX35_L2CC_BASE_ADDR		0x30000000
 #define MX35_L2CC_SIZE			SZ_1M
 
diff --git a/arch/arm/plat-mxc/include/mach/mx5x.h b/arch/arm/plat-mxc/include/mach/mx5x.h
index 8ecd236ca5f1..5c16710221d1 100644
--- a/arch/arm/plat-mxc/include/mach/mx5x.h
+++ b/arch/arm/plat-mxc/include/mach/mx5x.h
@@ -98,12 +98,6 @@
 #define SND_RAM_SIZE 0
 #endif
 
-#ifdef CONFIG_MXC_VPU_IRAM
-#define VPU_IRAM_SIZE  0x14000
-#else
-#define VPU_IRAM_SIZE 0
-#endif
-
 #if defined(CONFIG_USB_STATIC_IRAM) \
     || defined(CONFIG_USB_STATIC_IRAM_PPH)
 #define USB_IRAM_SIZE	SZ_8K