ENGR00155147 mx5x mx6x: adjust dma zone max size to 184M

adjust dma zone max size to 184M.
keep default size as 96M.

Signed-off-by: Jason Chen <b02280@freescale.com>

6 files changed, 49 insertions, 58 deletions

diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig
index 36dbe18aa92..6d02118cd4f 100644
--- a/arch/arm/mach-mx5/Kconfig
+++ b/arch/arm/mach-mx5/Kconfig
@@ -245,12 +245,4 @@ config MACH_IMX_BLUETOOTH_RFKILL
        depends on RFKILL
        ---help---
 	Say Y to get the standard rfkill interface of Bluetooth
-
-config DMA_ZONE_SIZE
-        int "DMA memory zone size"
-        range 0 96
-        default 24
-        help
-          This is the size in MB for the DMA zone. The DMA zone is used for
-          dedicated memory for large contiguous video buffers
 endif
diff --git a/arch/arm/mach-mx6/Kconfig b/arch/arm/mach-mx6/Kconfig
index d6dc1cb6337..ccd3a332188 100644
--- a/arch/arm/mach-mx6/Kconfig
+++ b/arch/arm/mach-mx6/Kconfig
@@ -53,11 +53,4 @@ config MACH_MX6Q_SABREAUTO
 
 comment "MX6 Options:"
 
-config DMA_ZONE_SIZE
-        int "DMA memory zone size"
-        range 0 184
-        default 24
-        help
-          This is the size in MB for the DMA zone. The DMA zone is used for
-          dedicated memory for large contiguous video buffers
 endif
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index 10afd94b654..589956035a6 100644
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -151,4 +151,12 @@ config CLK_DEBUG
 	help
 	  export clk debug information to user space
 
+config DMA_ZONE_SIZE
+        int "DMA memory zone size"
+        range 0 184
+        default 24
+        help
+          This is the size in MB for the DMA zone. The DMA zone is used for
+          dedicated memory for large contiguous video buffers
+
 endif
diff --git a/arch/arm/plat-mxc/include/mach/hardware.h b/arch/arm/plat-mxc/include/mach/hardware.h
index b9c9d08c8e3..8bbaad76b60 100644
--- a/arch/arm/plat-mxc/include/mach/hardware.h
+++ b/arch/arm/plat-mxc/include/mach/hardware.h
@@ -50,54 +50,54 @@
  * It applies the following mappings for the different SoCs:
  *
  * mx1:
- *	IO	0x00200000+0x100000	->	0xf4000000+0x100000
+ *	IO	0x00200000+0x100000	->	0xf2000000+0x100000
  * mx21:
- *	AIPI	0x10000000+0x100000	->	0xf4400000+0x100000
- *	SAHB1	0x80000000+0x100000	->	0xf4000000+0x100000
- *	X_MEMC	0xdf000000+0x004000	->	0xf5f00000+0x004000
+ *	AIPI	0x10000000+0x100000	->	0xf2400000+0x100000
+ *	SAHB1	0x80000000+0x100000	->	0xf2000000+0x100000
+ *	X_MEMC	0xdf000000+0x004000	->	0xf3f00000+0x004000
  * mx25:
- *	AIPS1	0x43f00000+0x100000	->	0xf5300000+0x100000
- *	AIPS2	0x53f00000+0x100000	->	0xf5700000+0x100000
- *	AVIC	0x68000000+0x100000	->	0xf5800000+0x100000
+ *	AIPS1	0x43f00000+0x100000	->	0xf3300000+0x100000
+ *	AIPS2	0x53f00000+0x100000	->	0xf3700000+0x100000
+ *	AVIC	0x68000000+0x100000	->	0xf3800000+0x100000
  * mx27:
- *	AIPI	0x10000000+0x100000	->	0xf4400000+0x100000
- *	SAHB1	0x80000000+0x100000	->	0xf4000000+0x100000
- *	X_MEMC	0xd8000000+0x100000	->	0xf5c00000+0x100000
+ *	AIPI	0x10000000+0x100000	->	0xf2400000+0x100000
+ *	SAHB1	0x80000000+0x100000	->	0xf2000000+0x100000
+ *	X_MEMC	0xd8000000+0x100000	->	0xf3c00000+0x100000
  * mx31:
- *	AIPS1	0x43f00000+0x100000	->	0xf5300000+0x100000
- *	AIPS2	0x53f00000+0x100000	->	0xf5700000+0x100000
- *	AVIC	0x68000000+0x100000	->	0xf5800000+0x100000
- *	X_MEMC	0xb8000000+0x010000	->	0xf4c00000+0x010000
- *	SPBA0	0x50000000+0x100000	->	0xf5400000+0x100000
+ *	AIPS1	0x43f00000+0x100000	->	0xf3300000+0x100000
+ *	AIPS2	0x53f00000+0x100000	->	0xf3700000+0x100000
+ *	AVIC	0x68000000+0x100000	->	0xf3800000+0x100000
+ *	X_MEMC	0xb8000000+0x010000	->	0xf2c00000+0x010000
+ *	SPBA0	0x50000000+0x100000	->	0xf3400000+0x100000
  * mx35:
- *	AIPS1	0x43f00000+0x100000	->	0xf5300000+0x100000
- *	AIPS2	0x53f00000+0x100000	->	0xf5700000+0x100000
- *	AVIC	0x68000000+0x100000	->	0xf5800000+0x100000
- *	X_MEMC	0xb8000000+0x010000	->	0xf4c00000+0x010000
- *	SPBA0	0x50000000+0x100000	->	0xf5400000+0x100000
+ *	AIPS1	0x43f00000+0x100000	->	0xf3300000+0x100000
+ *	AIPS2	0x53f00000+0x100000	->	0xf3700000+0x100000
+ *	AVIC	0x68000000+0x100000	->	0xf3800000+0x100000
+ *	X_MEMC	0xb8000000+0x010000	->	0xf2c00000+0x010000
+ *	SPBA0	0x50000000+0x100000	->	0xf3400000+0x100000
  * mx50:
- *	TZIC	0x0fffc000+0x004000	->	0xf4bfc000+0x004000
- *	SPBA0	0x50000000+0x100000	->	0xf5400000+0x100000
- *	AIPS1	0x53f00000+0x100000	->	0xf5700000+0x100000
- *	AIPS2	0x63f00000+0x100000	->	0xf5300000+0x100000
+ *	TZIC	0x0fffc000+0x004000	->	0xf2bfc000+0x004000
+ *	SPBA0	0x50000000+0x100000	->	0xf3400000+0x100000
+ *	AIPS1	0x53f00000+0x100000	->	0xf3700000+0x100000
+ *	AIPS2	0x63f00000+0x100000	->	0xf3300000+0x100000
  * mx51:
- *	IRAM	0x1ffe0000+0x020000	->	0xf4fe0000+0x020000
- *	DEBUG	0x60000000+0x100000	->	0xf5000000+0x100000
- *	SPBA0	0x70000000+0x100000	->	0xf5400000+0x100000
- *	AIPS1	0x73f00000+0x100000	->	0xf5700000+0x100000
- *	AIPS2	0x83f00000+0x100000	->	0xf4300000+0x100000
+ *	IRAM	0x1ffe0000+0x020000	->	0xf2fe0000+0x020000
+ *	DEBUG	0x60000000+0x100000	->	0xf3000000+0x100000
+ *	SPBA0	0x70000000+0x100000	->	0xf3400000+0x100000
+ *	AIPS1	0x73f00000+0x100000	->	0xf3700000+0x100000
+ *	AIPS2	0x83f00000+0x100000	->	0xf2300000+0x100000
  * mxc91231:
- *	L2CC	0x30000000+0x010000	->	0xf4400000+0x010000
- *	X_MEMC	0xb8000000+0x010000	->	0xf4c00000+0x010000
- *	ROMP	0x60000000+0x010000	->	0xf5000000+0x010000
- *	AVIC	0x68000000+0x010000	->	0xf5800000+0x010000
- *	AIPS1	0x43f00000+0x100000	->	0xf5300000+0x100000
- *	SPBA0	0x50000000+0x100000	->	0xf5400000+0x100000
- *	SPBA1	0x52000000+0x100000	->	0xf5600000+0x100000
- *	AIPS2	0x53f00000+0x100000	->	0xf5700000+0x100000
+ *	L2CC	0x30000000+0x010000	->	0xf2400000+0x010000
+ *	X_MEMC	0xb8000000+0x010000	->	0xf2c00000+0x010000
+ *	ROMP	0x60000000+0x010000	->	0xf3000000+0x010000
+ *	AVIC	0x68000000+0x010000	->	0xf3800000+0x010000
+ *	AIPS1	0x43f00000+0x100000	->	0xf3300000+0x100000
+ *	SPBA0	0x50000000+0x100000	->	0xf3400000+0x100000
+ *	SPBA1	0x52000000+0x100000	->	0xf3600000+0x100000
+ *	AIPS2	0x53f00000+0x100000	->	0xf3700000+0x100000
  */
 #define IMX_IO_P2V(x)	(						\
-			0xf4000000 +					\
+			0xf2000000 +					\
 			(((x) & 0x50000000) >> 6) +			\
 			(((x) & 0x0b000000) >> 4) +			\
 			(((x) & 0x000fffff)))
diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h
index 00359c1e368..8275e6a2054 100644
--- a/arch/arm/plat-mxc/include/mach/memory.h
+++ b/arch/arm/plat-mxc/include/mach/memory.h
@@ -66,9 +66,7 @@
 #define CONSISTENT_DMA_SIZE SZ_4M
 #else
 
-#if defined(CONFIG_ARCH_MX5)
-#define CONSISTENT_DMA_SIZE     (96 * SZ_1M)
-#elif defined(CONFIG_ARCH_MX6)
+#if defined(CONFIG_ARCH_MX5) || defined(CONFIG_ARCH_MX6)
 #define CONSISTENT_DMA_SIZE     (184 * SZ_1M)
 #else
 #define CONSISTENT_DMA_SIZE     (32 * SZ_1M)
diff --git a/arch/arm/plat-mxc/include/mach/vmalloc.h b/arch/arm/plat-mxc/include/mach/vmalloc.h
index ef6379c474b..44ea15a840f 100644
--- a/arch/arm/plat-mxc/include/mach/vmalloc.h
+++ b/arch/arm/plat-mxc/include/mach/vmalloc.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2000 Russell King.
- *  Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
+ *  Copyright 2004-2011 Freescale Semiconductor, Inc. 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 as published by
@@ -17,6 +17,6 @@
 #define __ASM_ARCH_MXC_VMALLOC_H__
 
 /* vmalloc ending address */
-#define VMALLOC_END       0xf4000000UL
+#define VMALLOC_END       0xf2000000UL
 
 #endif /* __ASM_ARCH_MXC_VMALLOC_H__ */