diff options
| author | Rob Herring <r.herring@freescale.com> | 2010-02-04 09:40:46 -0600 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-05-24 12:16:00 +0200 |
| commit | 9f1ab6dd9efdb579d967437e7abd06bbe1fabd94 (patch) | |
| tree | 882709e0eb52b6bc479aa9866e3b1891711355b7 /arch/arm/plat-mxc | |
| parent | 2a813db9284a0cffe7ff99520506b43c210277b2 (diff) | |
ENGR00120394-4 mx51: Clean-up IO_ADDRESS usage
Replace static mappings with dynamic mapping in MX51 MSL.
Signed-off-by: Rob Herring <r.herring@freescale.com>
Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'arch/arm/plat-mxc')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/mx51.h | 20 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/sdma/iapi/include/epm.h | 5 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/sdma/sdma.c | 8 |
3 files changed, 12 insertions, 21 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mx51.h b/arch/arm/plat-mxc/include/mach/mx51.h index 12b1db94f6c0..82e2eac26071 100644 --- a/arch/arm/plat-mxc/include/mach/mx51.h +++ b/arch/arm/plat-mxc/include/mach/mx51.h @@ -103,11 +103,9 @@ #define TZIC_BASE_ADDR_T01 0x8FFFC000 #define TZIC_BASE_ADDR 0xE0000000 -#define TZIC_BASE_ADDR_VIRT 0xFA100000 #define TZIC_SIZE SZ_16K #define DEBUG_BASE_ADDR 0x60000000 -#define DEBUG_BASE_ADDR_VIRT 0xFA200000 #define DEBUG_SIZE SZ_1M #define ETB_BASE_ADDR (DEBUG_BASE_ADDR + 0x00001000) #define ETM_BASE_ADDR (DEBUG_BASE_ADDR + 0x00002000) @@ -158,7 +156,7 @@ * AIPS 1 */ #define AIPS1_BASE_ADDR 0x73F00000 -#define AIPS1_BASE_ADDR_VIRT 0xFB000000 +#define AIPS1_BASE_ADDR_VIRT 0xF7E00000 #define AIPS1_SIZE SZ_1M #define OTG_BASE_ADDR (AIPS1_BASE_ADDR + 0x00080000) @@ -218,7 +216,7 @@ * AIPS 2 */ #define AIPS2_BASE_ADDR 0x83F00000 -#define AIPS2_BASE_ADDR_VIRT 0xFB200000 +#define AIPS2_BASE_ADDR_VIRT 0xF7D00000 #define AIPS2_SIZE SZ_1M #define PLL1_BASE_ADDR (AIPS2_BASE_ADDR + 0x00080000) @@ -276,13 +274,7 @@ */ #define IO_ADDRESS(x) \ (void __force __iomem *) \ - ((((x) >= (unsigned long)TZIC_BASE_ADDR) && \ - ((x) < (unsigned long)TZIC_BASE_ADDR + TZIC_SIZE)) ? \ - TZIC_IO_ADDRESS(x):\ - (((x) >= (unsigned long)DEBUG_BASE_ADDR) && \ - ((x) < (unsigned long)DEBUG_BASE_ADDR + DEBUG_SIZE)) ? \ - DEBUG_IO_ADDRESS(x):\ - (((x) >= (unsigned long)SPBA0_BASE_ADDR) && \ + ((((x) >= (unsigned long)SPBA0_BASE_ADDR) && \ ((x) < (unsigned long)SPBA0_BASE_ADDR + SPBA0_SIZE)) ? \ SPBA0_IO_ADDRESS(x):\ (((x) >= (unsigned long)AIPS1_BASE_ADDR) && \ @@ -299,12 +291,6 @@ /* * define the address mapping macros: in physical address order */ -#define TZIC_IO_ADDRESS(x) \ - (((x) - TZIC_BASE_ADDR) + TZIC_BASE_ADDR_VIRT) - -#define DEBUG_IO_ADDRESS(x) \ - (((x) - DEBUG_BASE_ADDR) + DEBUG_BASE_ADDR_VIRT) - #define SPBA0_IO_ADDRESS(x) \ (((x) - SPBA0_BASE_ADDR) + SPBA0_BASE_ADDR_VIRT) diff --git a/arch/arm/plat-mxc/sdma/iapi/include/epm.h b/arch/arm/plat-mxc/sdma/iapi/include/epm.h index a12fff923a15..f9c3a9022b27 100644 --- a/arch/arm/plat-mxc/sdma/iapi/include/epm.h +++ b/arch/arm/plat-mxc/sdma/iapi/include/epm.h @@ -1,5 +1,5 @@ /* - * Copyright 2007-2009 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright (C) 2007-2010 Freescale Semiconductor, Inc. All Rights Reserved. */ /* @@ -17,7 +17,8 @@ #include <mach/hardware.h> /* SDMA Reg definition */ -#define SDMA_BASE_IO_ADDR IO_ADDRESS(SDMA_BASE_ADDR) +extern void __iomem *sdma_base; +#define SDMA_BASE_IO_ADDR (sdma_base) #define SDMA_H_C0PTR *((volatile unsigned long *)(SDMA_BASE_IO_ADDR + 0x000)) #define SDMA_H_INTR *((volatile unsigned long *)(SDMA_BASE_IO_ADDR + 0x004)) diff --git a/arch/arm/plat-mxc/sdma/sdma.c b/arch/arm/plat-mxc/sdma/sdma.c index 6bdce3375134..8ad2603f11c8 100644 --- a/arch/arm/plat-mxc/sdma/sdma.c +++ b/arch/arm/plat-mxc/sdma/sdma.c @@ -1,5 +1,5 @@ /* - * Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved. */ /* @@ -66,8 +66,8 @@ extern void init_sdma_pool(void); * Flags are save and restored during interrupt handler */ unsigned long flags; - struct clk *mxc_sdma_ahb_clk, *mxc_sdma_ipg_clk; +void __iomem *sdma_base; /*! * Structure containing sdma channels information. @@ -1411,6 +1411,10 @@ int __init sdma_init(void) goto sdma_init_fail; } + sdma_base = ioremap(SDMA_BASE_ADDR, SZ_4K); + if (sdma_base == NULL) + goto sdma_init_fail; + init_mutexes(); init_iapi_struct(); |