Merge tag 'cleanup-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[cascardo/linux.git] / arch / arm / mach-pxa / generic.c

diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c
index 6f38e1a..630fa91 100644 (file)
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@ -90,19 +90,15 @@ EXPORT_SYMBOL(get_clk_frequency_khz);
  */
 static struct map_desc common_io_desc[] __initdata = {
        {       /* Devs */
-               .virtual        =  0xf2000000,
-               .pfn            = __phys_to_pfn(0x40000000),
-               .length         = 0x02000000,
-               .type           = MT_DEVICE
-       }, {    /* UNCACHED_PHYS_0 */
-               .virtual        = 0xff000000,
-               .pfn            = __phys_to_pfn(0x00000000),
-               .length         = 0x00100000,
+               .virtual        = (unsigned long)PERIPH_VIRT,
+               .pfn            = __phys_to_pfn(PERIPH_PHYS),
+               .length         = PERIPH_SIZE,
                .type           = MT_DEVICE
        }
 };
 
 void __init pxa_map_io(void)
 {
+       debug_ll_io_init();
        iotable_init(ARRAY_AND_SIZE(common_io_desc));
 }