ENGR00120393-5 imx: convert platform code to use iram allocator

Convert all i.MX platforms over to iram allocator functions.

Signed-off-by: Rob Herring <r.herring@freescale.com>

4 files changed, 10 insertions, 26 deletions

diff --git a/arch/arm/mach-mx35/Kconfig b/arch/arm/mach-mx35/Kconfig
index 6fdc1dd45919..3e126e0914f2 100644
--- a/arch/arm/mach-mx35/Kconfig
+++ b/arch/arm/mach-mx35/Kconfig
@@ -46,23 +46,11 @@ config MXC_SDMA_API
            This selects the Freescale MXC SDMA API.
            If unsure, say N.
 
-menu "SDMA options"
-        depends on MXC_SDMA_API
-
 config SDMA_IRAM
-        bool "Use Internal RAM for SDMA transfer"
-        default n
-       help
-           Support Internal RAM as SDMA buffer or control structures
-
-config SDMA_IRAM_SIZE
-        hex "Reserved bytes of IRAM for SDMA (0x800-0x1000)"
-        range 0x800 0x1000
-        depends on SDMA_IRAM
-        default "0x1000"
-        help
-           Set the size of IRAM for SDMA. It must be a multiple of 512bytes.
-endmenu
+	bool "Use Internal RAM for SDMA transfer"
+	depends on MXC_SDMA_API
+	help
+	  Support Internal RAM as SDMA buffer or control structures
 
 config ARCH_MXC_HAS_NFC_V2
         bool "MXC NFC Hardware Version 2"
diff --git a/arch/arm/mach-mx35/cpu.c b/arch/arm/mach-mx35/cpu.c
index 90848a55e0ad..9d754ea05f8c 100644
--- a/arch/arm/mach-mx35/cpu.c
+++ b/arch/arm/mach-mx35/cpu.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright (C) 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
  */
 
 /*
@@ -22,8 +22,9 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <mach/hardware.h>
 #include <linux/io.h>
+#include <linux/iram_alloc.h>
+#include <mach/hardware.h>
 #include <asm/hardware/cache-l2x0.h>
 
 /*!
@@ -57,6 +58,8 @@ static int __init post_cpu_init(void)
 	if (l2_base)
 		l2x0_init(l2_base, 0x00030024, 0x00000000);
 
+	iram_init(MX35_IRAM_BASE_ADDR, MX35_IRAM_SIZE);
+
 	/*
 	 * S/W workaround: Clear the off platform peripheral modules
 	 * Supervisor Protect bit for SDMA to access them.
diff --git a/arch/arm/mach-mx35/mm.c b/arch/arm/mach-mx35/mm.c
index 2d86bae4b3bd..371080e46a0f 100644
--- a/arch/arm/mach-mx35/mm.c
+++ b/arch/arm/mach-mx35/mm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright (C) 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
  */
 
 /*
@@ -30,11 +30,6 @@
  */
 static struct map_desc mx35_io_desc[] __initdata = {
 	{
-	 .virtual = IRAM_BASE_ADDR_VIRT,
-	 .pfn = __phys_to_pfn(MX35_IRAM_BASE_ADDR),
-	 .length = MX35_IRAM_SIZE,
-	 .type = MT_DEVICE_NONSHARED},
-	{
 	 .virtual = X_MEMC_BASE_ADDR_VIRT,
 	 .pfn = __phys_to_pfn(X_MEMC_BASE_ADDR),
 	 .length = X_MEMC_SIZE,
diff --git a/arch/arm/mach-mx35/mx35_3stack.c b/arch/arm/mach-mx35/mx35_3stack.c
index 8aba7445038c..74cd39639664 100644
--- a/arch/arm/mach-mx35/mx35_3stack.c
+++ b/arch/arm/mach-mx35/mx35_3stack.c
@@ -279,8 +279,6 @@ static struct resource mlb_resource[] = {
 };
 
 static struct mxc_mlb_platform_data mlb_data = {
-	.buf_address = IRAM_BASE_ADDR_VIRT + MLB_IRAM_ADDR_OFFSET,
-	.phy_address = IRAM_BASE_ADDR + MLB_IRAM_ADDR_OFFSET,
 	.reg_nvcc = "VVIDEO",
 	.mlb_clk = "mlb_clk",
 };