diff options
| author | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-05-26 15:03:02 +0200 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-05-26 15:03:02 +0200 |
| commit | 88d04a0f927c37fa331ed91ac688274008f06f81 (patch) | |
| tree | f1555c79a8279f507a0a5341fc724391ee57b879 | |
| parent | 7f84f40f9cce6dfd9acf73e22863610f057861fd (diff) | |
ccwmx51js: Extend th memory map to include the NAND flash base address.
Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
| -rw-r--r-- | arch/arm/mach-mx5/mm.c | 5 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/mx5x.h | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-mx5/mm.c b/arch/arm/mach-mx5/mm.c index 810cb1bf1ca8..8ac23c100bd9 100644 --- a/arch/arm/mach-mx5/mm.c +++ b/arch/arm/mach-mx5/mm.c @@ -44,6 +44,11 @@ static struct map_desc mx5_io_desc[] __initdata = { .pfn = __phys_to_pfn(AIPS2_BASE_ADDR), .length = AIPS2_SIZE, .type = MT_DEVICE}, + { + .virtual = NFC_BASE_ADDR_AXI_VIRT, + .pfn = __phys_to_pfn(NFC_BASE_ADDR_AXI), + .length = NFC_AXI_SIZE, + .type = MT_DEVICE}, }; /*! diff --git a/arch/arm/plat-mxc/include/mach/mx5x.h b/arch/arm/plat-mxc/include/mach/mx5x.h index 274a84666d53..5be0f426c7da 100644 --- a/arch/arm/plat-mxc/include/mach/mx5x.h +++ b/arch/arm/plat-mxc/include/mach/mx5x.h @@ -110,6 +110,8 @@ */ #define MX53_NFC_BASE_ADDR_AXI 0xF7FF0000 /* NAND flash AXI */ #define MX51_NFC_BASE_ADDR_AXI 0xCFFF0000 /* NAND flash AXI */ +//#define NFC_BASE_ADDR_AXI (cpu_is_mx53() ? MX53_NFC_BASE_ADDR_AXI:MX51_NFC_BASE_ADDR_AXI) +#define NFC_BASE_ADDR_AXI (MX51_NFC_BASE_ADDR_AXI) #define NFC_BASE_ADDR_AXI_VIRT 0xF9000000 #define NFC_AXI_SIZE SZ_64K @@ -349,6 +351,9 @@ (((x) >= (unsigned long)AIPS2_BASE_ADDR) && \ ((x) < (unsigned long)AIPS2_BASE_ADDR + AIPS2_SIZE)) ? \ AIPS2_IO_ADDRESS(x) : \ + (((x) >= (unsigned long)NFC_BASE_ADDR_AXI) && \ + ((x) < (unsigned long)NFC_BASE_ADDR_AXI + NFC_AXI_SIZE)) ? \ + NFC_AXI_IO_ADDRESS(x) : \ 0xDEADBEEF) /* @@ -363,6 +368,9 @@ #define AIPS2_IO_ADDRESS(x) \ (((x) - AIPS2_BASE_ADDR) + AIPS2_BASE_ADDR_VIRT) +#define NFC_AXI_IO_ADDRESS(x) \ + (((x) - NFC_BASE_ADDR_AXI) + NFC_BASE_ADDR_AXI_VIRT) + #define MX53_BASE_ADDR(x) (cpu_is_mx53() ? (x) - 0x20000000 : (x)) #define IS_MEM_DEVICE_NONSHARED(x) 0 |