diff options
| author | Rob Herring <r.herring@freescale.com> | 2010-01-22 15:01:30 -0200 |
|---|---|---|
| committer | Rob Herring <r.herring@freescale.com> | 2010-02-04 10:50:51 -0600 |
| commit | 2e11f9345f81cc865ab9c2448df43946ffea3266 (patch) | |
| tree | bfb3aa0380aef35d4745e8b62f8302dea14631f4 /arch/arm/mach-mx25 | |
| parent | 82d10ee252081f73c4850264478612faf9ec4fcf (diff) | |
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>
Diffstat (limited to 'arch/arm/mach-mx25')
| -rw-r--r-- | arch/arm/mach-mx25/Kconfig | 20 | ||||
| -rw-r--r-- | arch/arm/mach-mx25/cpu.c | 7 | ||||
| -rw-r--r-- | arch/arm/mach-mx25/mm.c | 7 |
3 files changed, 10 insertions, 24 deletions
diff --git a/arch/arm/mach-mx25/Kconfig b/arch/arm/mach-mx25/Kconfig index 3f404eeb326f..3049e52ea1de 100644 --- a/arch/arm/mach-mx25/Kconfig +++ b/arch/arm/mach-mx25/Kconfig @@ -28,23 +28,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-mx25/cpu.c b/arch/arm/mach-mx25/cpu.c index d44ad5530921..22a085420a4b 100644 --- a/arch/arm/mach-mx25/cpu.c +++ b/arch/arm/mach-mx25/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 <linux/io.h> +#include <linux/iram_alloc.h> #include <mach/hardware.h> -#include <asm/io.h> /*! * CPU initialization. It is called by fixup_mxc_board() @@ -39,6 +40,8 @@ static int __init post_cpu_init(void) void __iomem *base; unsigned int reg; + iram_init(IRAM_BASE_ADDR, IRAM_SIZE); + base = IO_ADDRESS(AIPS1_BASE_ADDR); __raw_writel(0x0, base + 0x40); __raw_writel(0x0, base + 0x44); diff --git a/arch/arm/mach-mx25/mm.c b/arch/arm/mach-mx25/mm.c index bfd83833be72..8f58a51f4114 100644 --- a/arch/arm/mach-mx25/mm.c +++ b/arch/arm/mach-mx25/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 mx25_io_desc[] __initdata = { { - .virtual = IRAM_BASE_ADDR_VIRT, - .pfn = __phys_to_pfn(IRAM_BASE_ADDR), - .length = IRAM_SIZE, - .type = MT_DEVICE}, - { .virtual = X_MEMC_BASE_ADDR_VIRT, .pfn = __phys_to_pfn(X_MEMC_BASE_ADDR), .length = X_MEMC_SIZE, |