diff options
| author |   Marek Vasut <marek.vasut@gmail.com> | 2010-11-03 16:29:35 +0100 |
|---|---|---|
| committer |   Eric Miao <eric.y.miao@gmail.com> | 2010-12-16 14:31:16 +0800 |
| commit | ad68bb9f7a3cd47396635a5e3895215af57579da (patch) | |
| tree | 6d9890bc0112b637e95afa0129a08fc20e325234 /arch/arm/mach-pxa/pxa25x.c | |
| parent | ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() (diff) | |
| download | linux-dev-ad68bb9f7a3cd47396635a5e3895215af57579da.tar.xz linux-dev-ad68bb9f7a3cd47396635a5e3895215af57579da.zip | |
ARM: pxa: Access SMEMC via virtual addresses
This is important because on PXA3xx, the physical mapping of SMEMC registers
differs from the one on PXA2xx. In order to get PCMCIA working on both PXA2xx
and PXA320, the PCMCIA driver was adjusted accordingly as well.
Also, various places in the kernel had to be patched to use
__raw_read/__raw_write.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm/mach-pxa/pxa25x.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 67200ce25e1c..23136b6afa8e 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c @@ -31,6 +31,7 @@ #include <mach/reset.h> #include <mach/pm.h> #include <mach/dma.h> +#include <mach/smemc.h> #include "generic.h" #include "devices.h" @@ -323,8 +324,8 @@ void __init pxa26x_init_irq(void) static struct map_desc pxa25x_io_desc[] __initdata = { { /* Mem Ctl */ - .virtual = 0xf6000000, - .pfn = __phys_to_pfn(0x48000000), + .virtual = SMEMC_VIRT, + .pfn = __phys_to_pfn(PXA2XX_SMEMC_BASE), .length = 0x00200000, .type = MT_DEVICE }, |