Merge branches 'for-3.18/always-poll-quirk', 'for-3.18/logitech', 'for-3.18/picolcd...

[deliverable/linux.git] / arch / arm / mach-pxa / pxa25x.c

diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index f2c28972084d92e9dbb74aca91804a093534093b..66e4a2b6316ea650d02aace1fcc4dfae7e5a8909 100644 (file)
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -331,7 +331,12 @@ static struct map_desc pxa25x_io_desc[] __initdata = {
        {       /* Mem Ctl */
                .virtual        = (unsigned long)SMEMC_VIRT,
                .pfn            = __phys_to_pfn(PXA2XX_SMEMC_BASE),
-               .length         = 0x00200000,
+               .length         = SMEMC_SIZE,
+               .type           = MT_DEVICE
+       }, {    /* UNCACHED_PHYS_0 */
+               .virtual        = UNCACHED_PHYS_0,
+               .pfn            = __phys_to_pfn(0x00000000),
+               .length         = UNCACHED_PHYS_0_SIZE,
                .type           = MT_DEVICE
        },
 };