| mapdesc-2613.patch | | Files affected: | arch/arm/kernel/ecard.c | 2 1 + 1 - 0 ! | arch/arm/mach-clps711x/p720t.c | 2 1 + 1 - 0 ! | arch/arm/mach-ebsa110/core.c | 8 4 + 4 - 0 ! | arch/arm/mach-footbridge/dc21285.c | 6 3 + 3 - 0 ! | arch/arm/mach-integrator/integrator_ap.c | 2 1 + 1 - 0 ! | arch/arm/mach-iop3xx/iop321-setup.c | 6 3 + 3 - 0 ! | arch/arm/mach-iop3xx/iq31244-mm.c | 2 1 + 1 - 0 ! | arch/arm/mach-iop3xx/iq31244-pci.c | 6 3 + 3 - 0 ! | arch/arm/mach-iop3xx/iq80321-mm.c | 2 1 + 1 - 0 ! | arch/arm/mach-iop3xx/iq80321-pci.c | 8 4 + 4 - 0 ! | arch/arm/mach-iop3xx/iq80332-pci.c | 8 4 + 4 - 0 ! | arch/arm/mach-ixp2000/pci.c | 4 2 + 2 - 0 ! | arch/arm/mach-ixp4xx/coyote-setup.c | 4 2 + 2 - 0 ! | arch/arm/mach-ixp4xx/ixdp425-setup.c | 8 4 + 4 - 0 ! | arch/arm/mach-pxa/corgi.c | 2 1 + 1 - 0 ! | arch/arm/mach-pxa/generic.c | 14 7 + 7 - 0 ! | arch/arm/mach-pxa/idp.c | 4 2 + 2 - 0 ! | arch/arm/mach-pxa/poodle.c | 2 1 + 1 - 0 ! | arch/arm/mach-rpc/riscpc.c | 2 1 + 1 - 0 ! | arch/arm/mach-s3c2410/cpu.h | 2 1 + 1 - 0 ! | arch/arm/mach-s3c2410/mach-bast.c | 26 13 + 13 - 0 ! | arch/arm/mach-s3c2410/mach-n30.c | 6 1 + 5 - 0 ! | arch/arm/mach-s3c2410/mach-rx3715.c | 4 2 + 2 - 0 ! | arch/arm/mach-s3c2410/mach-smdk2440.c | 4 2 + 2 - 0 ! | arch/arm/mach-s3c2410/mach-vr1000.c | 20 10 + 10 - 0 ! | arch/arm/mach-sa1100/assabet.c | 6 3 + 3 - 0 ! | arch/arm/mach-sa1100/badge4.c | 6 3 + 3 - 0 ! | arch/arm/mach-sa1100/cerf.c | 2 1 + 1 - 0 ! | arch/arm/mach-sa1100/collie.c | 4 2 + 2 - 0 ! | arch/arm/mach-sa1100/generic.c | 8 4 + 4 - 0 ! | arch/arm/mach-sa1100/hackkit.c | 2 1 + 1 - 0 ! | arch/arm/mach-sa1100/jornada720.c | 6 3 + 3 - 0 ! | arch/arm/mach-sa1100/lart.c | 4 2 + 2 - 0 ! | arch/arm/mach-sa1100/neponset.c | 4 2 + 2 - 0 ! | arch/arm/mach-sa1100/simpad.c | 4 2 + 2 - 0 ! | arch/arm/mm/mm-armv.c | 26 14 + 12 - 0 ! | include/asm-arm/arch-cl7500/hardware.h | 8 4 + 4 - 0 ! | include/asm-arm/arch-clps711x/autcpu12.h | 2 1 + 1 - 0 ! | include/asm-arm/arch-clps711x/hardware.h | 24 12 + 12 - 0 ! | include/asm-arm/arch-clps711x/system.h | 1 1 + 0 - 0 ! | include/asm-arm/arch-ebsa110/hardware.h | 10 5 + 5 - 0 ! | include/asm-arm/arch-ebsa285/hardware.h | 26 13 + 13 - 0 ! | include/asm-arm/arch-epxa10db/hardware.h | 2 1 + 1 - 0 ! | include/asm-arm/arch-integrator/hardware.h | 10 5 + 5 - 0 ! | include/asm-arm/arch-iop3xx/iop321.h | 6 3 + 3 - 0 ! | include/asm-arm/arch-iop3xx/iop331.h | 10 5 + 5 - 0 ! | include/asm-arm/arch-iop3xx/iq31244.h | 2 1 + 1 - 0 ! | include/asm-arm/arch-iop3xx/iq80321.h | 2 1 + 1 - 0 ! | include/asm-arm/arch-ixp2000/io.h | 2 2 + 0 - 0 ! | include/asm-arm/arch-ixp2000/ixdp2x00.h | 4 2 + 2 - 0 ! | include/asm-arm/arch-ixp2000/ixdp2x01.h | 4 2 + 2 - 0 ! | include/asm-arm/arch-ixp2000/ixp2000-regs.h | 24 12 + 12 - 0 ! | include/asm-arm/arch-ixp4xx/ixp4xx-regs.h | 8 4 + 4 - 0 ! | include/asm-arm/arch-l7200/hardware.h | 12 6 + 6 - 0 ! | include/asm-arm/arch-lh7a40x/constants.h | 10 5 + 5 - 0 ! | include/asm-arm/arch-omap/board-osk.h | 2 1 + 1 - 0 ! | include/asm-arm/arch-omap/fpga.h | 4 2 + 2 - 0 ! | include/asm-arm/arch-omap/omap1510.h | 6 3 + 3 - 0 ! | include/asm-arm/arch-omap/omap16xx.h | 6 3 + 3 - 0 ! | include/asm-arm/arch-omap/omap730.h | 6 3 + 3 - 0 ! | include/asm-arm/arch-pxa/lubbock.h | 2 1 + 1 - 0 ! | include/asm-arm/arch-pxa/mainstone.h | 2 1 + 1 - 0 ! | include/asm-arm/arch-rpc/hardware.h | 22 8 + 14 - 0 ! | include/asm-arm/arch-s3c2410/bast-map.h | 4 1 + 3 - 0 ! | include/asm-arm/arch-s3c2410/vr1000-map.h | 2 1 + 1 - 0 ! | include/asm-arm/arch-sa1100/dma.h | 2 1 + 1 - 0 ! | include/asm-arm/arch-sa1100/h3600.h | 6 3 + 3 - 0 ! | include/asm-arm/arch-sa1100/hardware.h | 4 2 + 2 - 0 ! | include/asm-arm/arch-shark/hardware.h | 6 3 + 3 - 0 ! | include/asm-arm/arch-versatile/hardware.h | 2 1 + 1 - 0 ! | include/asm-arm/hardware.h | 11 11 + 0 - 0 ! | include/asm-arm/hardware/dec21285.h | 2 1 + 1 - 0 ! | include/asm-arm/io.h | 4 3 + 1 - 0 ! | include/asm-arm/mach/map.h | 3 2 + 1 - 0 ! | include/asm-arm/vga.h | 2 1 + 1 - 0 ! | 75 files changed, 249 insertions(+), 242 deletions(-) | | Ben Dooks, Tue, 05 Jul 2005 12:26:29 +0100 diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/kernel/ecard.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/kernel/ecard.c --- linux-2.6.13-rc1-git6rmk/arch/arm/kernel/ecard.c 2005-06-30 12:51:26.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/kernel/ecard.c 2005-07-05 02:00:33.000000000 +0100 @@ -233,7 +233,7 @@ memcpy(dst_pgd, src_pgd, sizeof(pgd_t) * (IO_SIZE / PGDIR_SIZE)); - src_pgd = pgd_offset(mm, EASI_BASE); + src_pgd = pgd_offset(mm, (unsigned long)EASI_BASE); dst_pgd = pgd_offset(mm, EASI_START); memcpy(dst_pgd, src_pgd, sizeof(pgd_t) * (EASI_SIZE / PGDIR_SIZE)); diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-clps711x/p720t.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-clps711x/p720t.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-clps711x/p720t.c 2005-07-05 01:59:39.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-clps711x/p720t.c 2005-07-05 02:00:33.000000000 +0100 @@ -43,7 +43,7 @@ */ static struct map_desc p720t_io_desc[] __initdata = { { SYSPLD_VIRT_BASE, SYSPLD_PHYS_BASE, 1048576, MT_DEVICE }, - { 0xfe400000, 0x10400000, 1048576, MT_DEVICE } + { (void __iomem *)0xfe400000, 0x10400000, 1048576, MT_DEVICE } }; static void __init diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-ebsa110/core.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-ebsa110/core.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-ebsa110/core.c 2005-07-05 01:59:39.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-ebsa110/core.c 2005-07-05 02:00:33.000000000 +0100 @@ -30,10 +30,10 @@ #include -#define IRQ_MASK 0xfe000000 /* read */ -#define IRQ_MSET 0xfe000000 /* write */ -#define IRQ_STAT 0xff000000 /* read */ -#define IRQ_MCLR 0xff000000 /* write */ +#define IRQ_MASK (void __iomem *)0xfe000000 /* read */ +#define IRQ_MSET (void __iomem *)0xfe000000 /* write */ +#define IRQ_STAT (void __iomem *)0xff000000 /* read */ +#define IRQ_MCLR (void __iomem *)0xff000000 /* write */ static void ebsa110_mask_irq(unsigned int irq) { diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-footbridge/dc21285.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-footbridge/dc21285.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-footbridge/dc21285.c 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-footbridge/dc21285.c 2005-07-05 02:00:33.000000000 +0100 @@ -47,15 +47,15 @@ /* * For devfn 0, point at the 21285 */ - addr = ARMCSR_BASE; + addr = (unsigned long)ARMCSR_BASE; else { devfn -= 1 << 3; if (devfn < PCI_DEVFN(MAX_SLOTS, 0)) - addr = PCICFG0_BASE | 0xc00000 | (devfn << 8); + addr = (unsigned long)PCICFG0_BASE | 0xc00000 | (devfn << 8); } } else - addr = PCICFG1_BASE | (bus->number << 16) | (devfn << 8); + addr = (unsigned long)PCICFG1_BASE | (bus->number << 16) | (devfn << 8); return addr; } diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-integrator/integrator_ap.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-integrator/integrator_ap.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-integrator/integrator_ap.c 2005-07-05 01:59:39.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-integrator/integrator_ap.c 2005-07-05 02:00:33.000000000 +0100 @@ -222,7 +222,7 @@ static void ap_flash_set_vpp(int on) { - unsigned long reg = on ? SC_CTRLS : SC_CTRLC; + void __iomem *reg = on ? SC_CTRLS : SC_CTRLC; writel(INTEGRATOR_SC_CTRL_nFLVPPEN, reg); } diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-iop3xx/iop321-setup.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-iop3xx/iop321-setup.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-iop3xx/iop321-setup.c 2005-07-05 01:59:39.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-iop3xx/iop321-setup.c 2005-07-05 02:01:45.000000000 +0100 @@ -60,7 +60,7 @@ static struct uart_port iop321_serial_ports[] = { { .membase = (char*)(UARTBASE), - .mapbase = (UARTBASE), + .mapbase = (unsigned long)(UARTBASE), .irq = IRQ_UART, .flags = UPF_SKIP_TEST, .iotype = UPIO_MEM, @@ -149,7 +149,7 @@ /* Maintainer: Intel Corporation */ .phys_ram = PHYS_OFFSET, .phys_io = IQ80321_UART, - .io_pg_offst = ((IQ80321_UART) >> 18) & 0xfffc, + .io_pg_offst = (((u32)IQ80321_UART) >> 18) & 0xfffc, .map_io = iq80321_map_io, .init_irq = iop321_init_irq, .timer = &iop321_timer, @@ -161,7 +161,7 @@ /* Maintainer: Intel Corp. */ .phys_ram = PHYS_OFFSET, .phys_io = IQ31244_UART, - .io_pg_offst = ((IQ31244_UART) >> 18) & 0xfffc, + .io_pg_offst = (((u32)IQ31244_UART) >> 18) & 0xfffc, .map_io = iq31244_map_io, .init_irq = iop321_init_irq, .timer = &iop321_timer, diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-iop3xx/iq31244-mm.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-iop3xx/iq31244-mm.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-iop3xx/iq31244-mm.c 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-iop3xx/iq31244-mm.c 2005-07-05 02:00:33.000000000 +0100 @@ -33,7 +33,7 @@ /* virtual physical length type */ /* on-board devices */ - { IQ31244_UART, IQ31244_UART, 0x00100000, MT_DEVICE } + { IQ31244_UART, (u32)IQ31244_UART, 0x00100000, MT_DEVICE } }; void __init iq31244_map_io(void) diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-iop3xx/iq31244-pci.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-iop3xx/iq31244-pci.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-iop3xx/iq31244-pci.c 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-iop3xx/iq31244-pci.c 2005-07-05 02:00:33.000000000 +0100 @@ -78,8 +78,8 @@ memset(res, 0, sizeof(struct resource) * 2); - res[0].start = IOP321_PCI_LOWER_IO_VA; - res[0].end = IOP321_PCI_UPPER_IO_VA; + res[0].start = (unsigned long)IOP321_PCI_LOWER_IO_VA; + res[0].end = (unsigned long)IOP321_PCI_UPPER_IO_VA; res[0].name = "IQ31244 PCI I/O Space"; res[0].flags = IORESOURCE_IO; @@ -92,7 +92,7 @@ request_resource(&iomem_resource, &res[1]); sys->mem_offset = IOP321_PCI_MEM_OFFSET; - sys->io_offset = IOP321_PCI_IO_OFFSET; + sys->io_offset = (unsigned long)IOP321_PCI_IO_OFFSET; sys->resource[0] = &res[0]; sys->resource[1] = &res[1]; diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-iop3xx/iq80321-mm.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-iop3xx/iq80321-mm.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-iop3xx/iq80321-mm.c 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-iop3xx/iq80321-mm.c 2005-07-05 02:00:33.000000000 +0100 @@ -33,7 +33,7 @@ /* virtual physical length type */ /* on-board devices */ - { IQ80321_UART, IQ80321_UART, 0x00100000, MT_DEVICE } + { IQ80321_UART, (u32)IQ80321_UART, 0x00100000, MT_DEVICE } }; void __init iq80321_map_io(void) diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-iop3xx/iq80321-pci.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-iop3xx/iq80321-pci.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-iop3xx/iq80321-pci.c 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-iop3xx/iq80321-pci.c 2005-07-05 02:00:33.000000000 +0100 @@ -72,8 +72,8 @@ memset(res, 0, sizeof(struct resource) * 2); - res[0].start = IOP321_PCI_LOWER_IO_VA; - res[0].end = IOP321_PCI_UPPER_IO_VA; + res[0].start = (unsigned long)IOP321_PCI_LOWER_IO_VA; + res[0].end = (unsigned long)IOP321_PCI_UPPER_IO_VA; res[0].name = "IQ80321 PCI I/O Space"; res[0].flags = IORESOURCE_IO; @@ -85,8 +85,8 @@ request_resource(&ioport_resource, &res[0]); request_resource(&iomem_resource, &res[1]); - sys->mem_offset = IOP321_PCI_MEM_OFFSET; - sys->io_offset = IOP321_PCI_IO_OFFSET; + sys->mem_offset = (unsigned long)IOP321_PCI_MEM_OFFSET; + sys->io_offset = (unsigned long)IOP321_PCI_IO_OFFSET; sys->resource[0] = &res[0]; sys->resource[1] = &res[1]; diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-iop3xx/iq80332-pci.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-iop3xx/iq80332-pci.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-iop3xx/iq80332-pci.c 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-iop3xx/iq80332-pci.c 2005-07-05 02:00:33.000000000 +0100 @@ -74,8 +74,8 @@ memset(res, 0, sizeof(struct resource) * 2); - res[0].start = IOP331_PCI_LOWER_IO_VA; - res[0].end = IOP331_PCI_UPPER_IO_VA; + res[0].start = (unsigned long)IOP331_PCI_LOWER_IO_VA; + res[0].end = (unsigned long)IOP331_PCI_UPPER_IO_VA; res[0].name = "IQ80332 PCI I/O Space"; res[0].flags = IORESOURCE_IO; @@ -87,8 +87,8 @@ request_resource(&ioport_resource, &res[0]); request_resource(&iomem_resource, &res[1]); - sys->mem_offset = IOP331_PCI_MEM_OFFSET; - sys->io_offset = IOP331_PCI_IO_OFFSET; + sys->mem_offset = (unsigned long)IOP331_PCI_MEM_OFFSET; + sys->io_offset = (unsigned long)IOP331_PCI_IO_OFFSET; sys->resource[0] = &res[0]; sys->resource[1] = &res[1]; diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-ixp2000/pci.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-ixp2000/pci.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-ixp2000/pci.c 2005-06-30 12:51:26.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-ixp2000/pci.c 2005-07-05 02:00:33.000000000 +0100 @@ -53,11 +53,11 @@ */ if (!bus_nr) { /* only bits[23:16] are used for IDSEL */ - paddress = (u32 *) (IXP2000_PCI_CFG0_VIRT_BASE + paddress = (u32 *) ((u32)IXP2000_PCI_CFG0_VIRT_BASE | (1 << (PCI_SLOT(devfn) + 16)) | (PCI_FUNC(devfn) << 8) | where); } else { - paddress = (u32 *) (IXP2000_PCI_CFG1_VIRT_BASE + paddress = (u32 *) ((u32)IXP2000_PCI_CFG1_VIRT_BASE | (bus_nr << 16) | (PCI_SLOT(devfn) << 11) | (PCI_FUNC(devfn) << 8) | where); diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-ixp4xx/coyote-setup.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-ixp4xx/coyote-setup.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-ixp4xx/coyote-setup.c 2005-07-05 01:59:39.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-ixp4xx/coyote-setup.c 2005-07-05 02:03:45.000000000 +0100 @@ -103,7 +103,7 @@ /* Maintainer: MontaVista Software, Inc. */ .phys_ram = PHYS_OFFSET, .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, - .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, + .io_pg_offst = (((u32)IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, .map_io = coyote_map_io, .init_irq = ixp4xx_init_irq, .timer = &ixp4xx_timer, @@ -121,7 +121,7 @@ /* Maintainer: MontaVista Software, Inc. */ .phys_ram = PHYS_OFFSET, .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, - .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, + .io_pg_offst = (((u32)IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, .map_io = coyote_map_io, .init_irq = ixp4xx_init_irq, .timer = &ixp4xx_timer, diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-ixp4xx/ixdp425-setup.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-ixp4xx/ixdp425-setup.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-ixp4xx/ixdp425-setup.c 2005-07-05 01:59:39.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-ixp4xx/ixdp425-setup.c 2005-07-05 02:02:55.000000000 +0100 @@ -131,7 +131,7 @@ /* Maintainer: MontaVista Software, Inc. */ .phys_ram = PHYS_OFFSET, .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, - .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, + .io_pg_offst = (((u32)IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, .map_io = ixdp425_map_io, .init_irq = ixp4xx_init_irq, .timer = &ixp4xx_timer, @@ -143,7 +143,7 @@ /* Maintainer: MontaVista Software, Inc. */ .phys_ram = PHYS_OFFSET, .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, - .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, + .io_pg_offst = (((u32)IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, .map_io = ixdp425_map_io, .init_irq = ixp4xx_init_irq, .timer = &ixp4xx_timer, @@ -155,7 +155,7 @@ /* Maintainer: MontaVista Software, Inc. */ .phys_ram = PHYS_OFFSET, .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, - .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, + .io_pg_offst = (((u32)IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, .map_io = ixdp425_map_io, .init_irq = ixp4xx_init_irq, .timer = &ixp4xx_timer, @@ -174,7 +174,7 @@ /* Maintainer: Deepak Saxena */ .phys_ram = PHYS_OFFSET, .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, - .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, + .io_pg_offst = (((u32)IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, .map_io = ixdp425_map_io, .init_irq = ixp4xx_init_irq, .timer = &ixp4xx_timer, diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-pxa/corgi.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-pxa/corgi.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-pxa/corgi.c 2005-07-05 01:59:45.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-pxa/corgi.c 2005-07-05 02:00:33.000000000 +0100 @@ -266,7 +266,7 @@ /* virtual physical length */ /* { 0xf1000000, 0x08000000, 0x01000000, MT_DEVICE },*/ /* LCDC (readable for Qt driver) */ /* { 0xef700000, 0x10800000, 0x00001000, MT_DEVICE },*/ /* SCOOP */ - { 0xef800000, 0x00000000, 0x00800000, MT_DEVICE }, /* Boot Flash */ + { (void __iomem *)0xef800000, 0x00000000, 0x00800000, MT_DEVICE }, /* Boot Flash */ }; static void __init corgi_map_io(void) diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-pxa/generic.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-pxa/generic.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-pxa/generic.c 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-pxa/generic.c 2005-07-05 02:00:33.000000000 +0100 @@ -92,13 +92,13 @@ */ static struct map_desc standard_io_desc[] __initdata = { /* virtual physical length type */ - { 0xf2000000, 0x40000000, 0x02000000, MT_DEVICE }, /* Devs */ - { 0xf4000000, 0x44000000, 0x00100000, MT_DEVICE }, /* LCD */ - { 0xf6000000, 0x48000000, 0x00100000, MT_DEVICE }, /* Mem Ctl */ - { 0xf8000000, 0x4c000000, 0x00100000, MT_DEVICE }, /* USB host */ - { 0xfa000000, 0x50000000, 0x00100000, MT_DEVICE }, /* Camera */ - { 0xfe000000, 0x58000000, 0x00100000, MT_DEVICE }, /* IMem ctl */ - { 0xff000000, 0x00000000, 0x00100000, MT_DEVICE } /* UNCACHED_PHYS_0 */ + { (void __iomem *)0xf2000000, 0x40000000, 0x02000000, MT_DEVICE }, /* Devs */ + { (void __iomem *)0xf4000000, 0x44000000, 0x00100000, MT_DEVICE }, /* LCD */ + { (void __iomem *)0xf6000000, 0x48000000, 0x00100000, MT_DEVICE }, /* Mem Ctl */ + { (void __iomem *)0xf8000000, 0x4c000000, 0x00100000, MT_DEVICE }, /* USB host */ + { (void __iomem *)0xfa000000, 0x50000000, 0x00100000, MT_DEVICE }, /* Camera */ + { (void __iomem *)0xfe000000, 0x58000000, 0x00100000, MT_DEVICE }, /* IMem ctl */ + { (void __iomem *)0xff000000, 0x00000000, 0x00100000, MT_DEVICE } /* UNCACHED_PHYS_0 */ }; void __init pxa_map_io(void) diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-pxa/idp.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-pxa/idp.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-pxa/idp.c 2005-07-05 01:59:45.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-pxa/idp.c 2005-07-05 02:00:33.000000000 +0100 @@ -154,11 +154,11 @@ static struct map_desc idp_io_desc[] __initdata = { /* virtual physical length type */ - { IDP_COREVOLT_VIRT, + { (void __iomem *)IDP_COREVOLT_VIRT, IDP_COREVOLT_PHYS, IDP_COREVOLT_SIZE, MT_DEVICE }, - { IDP_CPLD_VIRT, + { (void __iomem *)IDP_CPLD_VIRT, IDP_CPLD_PHYS, IDP_CPLD_SIZE, MT_DEVICE } diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-pxa/poodle.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-pxa/poodle.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-pxa/poodle.c 2005-07-05 01:59:45.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-pxa/poodle.c 2005-07-05 02:00:33.000000000 +0100 @@ -161,7 +161,7 @@ static struct map_desc poodle_io_desc[] __initdata = { /* virtual physical length */ - { 0xef800000, 0x00000000, 0x00800000, MT_DEVICE }, /* Boot Flash */ + { (void __iomem *)0xef800000, 0x00000000, 0x00800000, MT_DEVICE }, /* Boot Flash */ }; static void __init poodle_map_io(void) diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-rpc/riscpc.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-rpc/riscpc.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-rpc/riscpc.c 2005-07-05 01:59:39.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-rpc/riscpc.c 2005-07-05 02:00:33.000000000 +0100 @@ -62,7 +62,7 @@ static struct map_desc rpc_io_desc[] __initdata = { { SCREEN_BASE, SCREEN_START, 2*1048576, MT_DEVICE }, /* VRAM */ - { (u32)IO_BASE, IO_START, IO_SIZE , MT_DEVICE }, /* IO space */ + { IO_BASE, IO_START, IO_SIZE , MT_DEVICE }, /* IO space */ { EASI_BASE, EASI_START, EASI_SIZE, MT_DEVICE } /* EASI space */ }; diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-s3c2410/cpu.h linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-s3c2410/cpu.h --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-s3c2410/cpu.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-s3c2410/cpu.h 2005-07-05 02:00:33.000000000 +0100 @@ -21,7 +21,7 @@ /* todo - fix when rmk changes iodescs to use `void __iomem *` */ -#define IODESC_ENT(x) { (unsigned long)S3C24XX_VA_##x, S3C2410_PA_##x, S3C24XX_SZ_##x, MT_DEVICE } +#define IODESC_ENT(x) { S3C24XX_VA_##x, S3C2410_PA_##x, S3C24XX_SZ_##x, MT_DEVICE } #ifndef MHZ #define MHZ (1000*1000) diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-s3c2410/mach-bast.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-s3c2410/mach-bast.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-s3c2410/mach-bast.c 2005-07-05 01:59:39.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-s3c2410/mach-bast.c 2005-07-05 02:00:33.000000000 +0100 @@ -72,10 +72,10 @@ #define COPYRIGHT ", (c) 2004-2005 Simtec Electronics" /* macros for virtual address mods for the io space entries */ -#define VA_C5(item) ((unsigned long)(item) + BAST_VAM_CS5) -#define VA_C4(item) ((unsigned long)(item) + BAST_VAM_CS4) -#define VA_C3(item) ((unsigned long)(item) + BAST_VAM_CS3) -#define VA_C2(item) ((unsigned long)(item) + BAST_VAM_CS2) +#define VA_C5(item) ((item) + BAST_VAM_CS5) +#define VA_C4(item) ((item) + BAST_VAM_CS4) +#define VA_C3(item) ((item) + BAST_VAM_CS3) +#define VA_C2(item) ((item) + BAST_VAM_CS2) /* macros to modify the physical addresses for io space */ @@ -87,8 +87,8 @@ static struct map_desc bast_iodesc[] __initdata = { /* ISA IO areas */ - { (u32)S3C24XX_VA_ISA_BYTE, PA_CS2(BAST_PA_ISAIO), SZ_16M, MT_DEVICE }, - { (u32)S3C24XX_VA_ISA_WORD, PA_CS3(BAST_PA_ISAIO), SZ_16M, MT_DEVICE }, + { S3C24XX_VA_ISA_BYTE, PA_CS2(BAST_PA_ISAIO), SZ_16M, MT_DEVICE }, + { S3C24XX_VA_ISA_WORD, PA_CS3(BAST_PA_ISAIO), SZ_16M, MT_DEVICE }, /* we could possibly compress the next set down into a set of smaller tables * pagetables, but that would mean using an L2 section, and it still means @@ -96,15 +96,15 @@ */ /* bast CPLD control registers, and external interrupt controls */ - { (u32)BAST_VA_CTRL1, BAST_PA_CTRL1, SZ_1M, MT_DEVICE }, - { (u32)BAST_VA_CTRL2, BAST_PA_CTRL2, SZ_1M, MT_DEVICE }, - { (u32)BAST_VA_CTRL3, BAST_PA_CTRL3, SZ_1M, MT_DEVICE }, - { (u32)BAST_VA_CTRL4, BAST_PA_CTRL4, SZ_1M, MT_DEVICE }, + { BAST_VA_CTRL1, BAST_PA_CTRL1, SZ_1M, MT_DEVICE }, + { BAST_VA_CTRL2, BAST_PA_CTRL2, SZ_1M, MT_DEVICE }, + { BAST_VA_CTRL3, BAST_PA_CTRL3, SZ_1M, MT_DEVICE }, + { BAST_VA_CTRL4, BAST_PA_CTRL4, SZ_1M, MT_DEVICE }, /* PC104 IRQ mux */ - { (u32)BAST_VA_PC104_IRQREQ, BAST_PA_PC104_IRQREQ, SZ_1M, MT_DEVICE }, - { (u32)BAST_VA_PC104_IRQRAW, BAST_PA_PC104_IRQRAW, SZ_1M, MT_DEVICE }, - { (u32)BAST_VA_PC104_IRQMASK, BAST_PA_PC104_IRQMASK, SZ_1M, MT_DEVICE }, + { BAST_VA_PC104_IRQREQ, BAST_PA_PC104_IRQREQ, SZ_1M, MT_DEVICE }, + { BAST_VA_PC104_IRQRAW, BAST_PA_PC104_IRQRAW, SZ_1M, MT_DEVICE }, + { BAST_VA_PC104_IRQMASK, BAST_PA_PC104_IRQMASK, SZ_1M, MT_DEVICE }, /* peripheral space... one for each of fast/slow/byte/16bit */ /* note, ide is only decoded in word space, even though some registers diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-s3c2410/mach-n30.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-s3c2410/mach-n30.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-s3c2410/mach-n30.c 2005-07-05 01:59:39.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-s3c2410/mach-n30.c 2005-07-05 02:00:33.000000000 +0100 @@ -44,10 +44,6 @@ #include "devs.h" #include "cpu.h" -static struct map_desc n30_iodesc[] __initdata = { - /* nothing here yet */ -}; - static struct s3c2410_uartcfg n30_uartcfgs[] = { /* Normal serial port */ [0] = { @@ -99,7 +95,7 @@ void __init n30_map_io(void) { - s3c24xx_init_io(n30_iodesc, ARRAY_SIZE(n30_iodesc)); + s3c24xx_init_io(NULL, 0); s3c24xx_init_clocks(0); s3c24xx_init_uarts(n30_uartcfgs, ARRAY_SIZE(n30_uartcfgs)); s3c24xx_set_board(&n30_board); diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-s3c2410/mach-rx3715.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-s3c2410/mach-rx3715.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-s3c2410/mach-rx3715.c 2005-07-05 01:59:39.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-s3c2410/mach-rx3715.c 2005-07-05 02:00:33.000000000 +0100 @@ -50,8 +50,8 @@ static struct map_desc rx3715_iodesc[] __initdata = { /* dump ISA space somewhere unused */ - { (u32)S3C24XX_VA_ISA_WORD, S3C2410_CS3, SZ_16M, MT_DEVICE }, - { (u32)S3C24XX_VA_ISA_BYTE, S3C2410_CS3, SZ_16M, MT_DEVICE }, + { S3C24XX_VA_ISA_WORD, S3C2410_CS3, SZ_16M, MT_DEVICE }, + { S3C24XX_VA_ISA_BYTE, S3C2410_CS3, SZ_16M, MT_DEVICE }, }; diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-s3c2410/mach-smdk2440.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-s3c2410/mach-smdk2440.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-s3c2410/mach-smdk2440.c 2005-07-05 01:59:39.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-s3c2410/mach-smdk2440.c 2005-07-05 02:00:33.000000000 +0100 @@ -52,8 +52,8 @@ static struct map_desc smdk2440_iodesc[] __initdata = { /* ISA IO Space map (memory space selected by A24) */ - { (u32)S3C24XX_VA_ISA_WORD, S3C2410_CS2, SZ_16M, MT_DEVICE }, - { (u32)S3C24XX_VA_ISA_BYTE, S3C2410_CS2, SZ_16M, MT_DEVICE }, + { S3C24XX_VA_ISA_WORD, S3C2410_CS2, SZ_16M, MT_DEVICE }, + { S3C24XX_VA_ISA_BYTE, S3C2410_CS2, SZ_16M, MT_DEVICE }, }; #define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-s3c2410/mach-vr1000.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-s3c2410/mach-vr1000.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-s3c2410/mach-vr1000.c 2005-07-05 01:59:39.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-s3c2410/mach-vr1000.c 2005-07-05 02:00:33.000000000 +0100 @@ -66,10 +66,10 @@ #include "usb-simtec.h" /* macros for virtual address mods for the io space entries */ -#define VA_C5(item) ((unsigned long)(item) + BAST_VAM_CS5) -#define VA_C4(item) ((unsigned long)(item) + BAST_VAM_CS4) -#define VA_C3(item) ((unsigned long)(item) + BAST_VAM_CS3) -#define VA_C2(item) ((unsigned long)(item) + BAST_VAM_CS2) +#define VA_C5(item) ((item) + BAST_VAM_CS5) +#define VA_C4(item) ((item) + BAST_VAM_CS4) +#define VA_C3(item) ((item) + BAST_VAM_CS3) +#define VA_C2(item) ((item) + BAST_VAM_CS2) /* macros to modify the physical addresses for io space */ @@ -81,8 +81,8 @@ static struct map_desc vr1000_iodesc[] __initdata = { /* ISA IO areas */ - { (u32)S3C24XX_VA_ISA_BYTE, PA_CS2(BAST_PA_ISAIO), SZ_16M, MT_DEVICE }, - { (u32)S3C24XX_VA_ISA_WORD, PA_CS3(BAST_PA_ISAIO), SZ_16M, MT_DEVICE }, + { S3C24XX_VA_ISA_BYTE, PA_CS2(BAST_PA_ISAIO), SZ_16M, MT_DEVICE }, + { S3C24XX_VA_ISA_WORD, PA_CS3(BAST_PA_ISAIO), SZ_16M, MT_DEVICE }, /* we could possibly compress the next set down into a set of smaller tables * pagetables, but that would mean using an L2 section, and it still means @@ -90,10 +90,10 @@ */ /* bast CPLD control registers, and external interrupt controls */ - { (u32)VR1000_VA_CTRL1, VR1000_PA_CTRL1, SZ_1M, MT_DEVICE }, - { (u32)VR1000_VA_CTRL2, VR1000_PA_CTRL2, SZ_1M, MT_DEVICE }, - { (u32)VR1000_VA_CTRL3, VR1000_PA_CTRL3, SZ_1M, MT_DEVICE }, - { (u32)VR1000_VA_CTRL4, VR1000_PA_CTRL4, SZ_1M, MT_DEVICE }, + { VR1000_VA_CTRL1, VR1000_PA_CTRL1, SZ_1M, MT_DEVICE }, + { VR1000_VA_CTRL2, VR1000_PA_CTRL2, SZ_1M, MT_DEVICE }, + { VR1000_VA_CTRL3, VR1000_PA_CTRL3, SZ_1M, MT_DEVICE }, + { VR1000_VA_CTRL4, VR1000_PA_CTRL4, SZ_1M, MT_DEVICE }, /* peripheral space... one for each of fast/slow/byte/16bit */ /* note, ide is only decoded in word space, even though some registers diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-sa1100/assabet.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-sa1100/assabet.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-sa1100/assabet.c 2005-07-05 01:59:39.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-sa1100/assabet.c 2005-07-05 02:00:33.000000000 +0100 @@ -381,9 +381,9 @@ }; static struct map_desc assabet_io_desc[] __initdata = { - /* virtual physical length type */ - { 0xf1000000, 0x12000000, 0x00100000, MT_DEVICE }, /* Board Control Register */ - { 0xf2800000, 0x4b800000, 0x00800000, MT_DEVICE } /* MQ200 */ + /* virtual physical length type */ + { (void __iomem *)0xf1000000, 0x12000000, 0x00100000, MT_DEVICE }, /* Board Control Register */ + { (void __iomem *)0xf2800000, 0x4b800000, 0x00800000, MT_DEVICE } /* MQ200 */ }; static void __init assabet_map_io(void) diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-sa1100/badge4.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-sa1100/badge4.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-sa1100/badge4.c 2005-07-05 01:59:39.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-sa1100/badge4.c 2005-07-05 02:00:33.000000000 +0100 @@ -255,9 +255,9 @@ static struct map_desc badge4_io_desc[] __initdata = { /* virtual physical length type */ - {0xf1000000, 0x08000000, 0x00100000, MT_DEVICE },/* SRAM bank 1 */ - {0xf2000000, 0x10000000, 0x00100000, MT_DEVICE },/* SRAM bank 2 */ - {0xf4000000, 0x48000000, 0x00100000, MT_DEVICE } /* SA-1111 */ + { (void __iomem *)0xf1000000, 0x08000000, 0x00100000, MT_DEVICE },/* SRAM bank 1 */ + { (void __iomem *)0xf2000000, 0x10000000, 0x00100000, MT_DEVICE },/* SRAM bank 2 */ + { (void __iomem *)0xf4000000, 0x48000000, 0x00100000, MT_DEVICE } /* SA-1111 */ }; static void diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-sa1100/cerf.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-sa1100/cerf.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-sa1100/cerf.c 2005-07-05 01:59:39.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-sa1100/cerf.c 2005-07-05 02:00:33.000000000 +0100 @@ -100,7 +100,7 @@ static struct map_desc cerf_io_desc[] __initdata = { /* virtual physical length type */ - { 0xf0000000, 0x08000000, 0x00100000, MT_DEVICE } /* Crystal Ethernet Chip */ + { (void __iomem *)0xf0000000, 0x08000000, 0x00100000, MT_DEVICE } /* Crystal Ethernet Chip */ }; static void __init cerf_map_io(void) diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-sa1100/collie.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-sa1100/collie.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-sa1100/collie.c 2005-07-05 01:59:39.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-sa1100/collie.c 2005-07-05 02:00:33.000000000 +0100 @@ -173,8 +173,8 @@ static struct map_desc collie_io_desc[] __initdata = { /* virtual physical length type */ - {0xe8000000, 0x00000000, 0x02000000, MT_DEVICE}, /* 32M main flash (cs0) */ - {0xea000000, 0x08000000, 0x02000000, MT_DEVICE}, /* 32M boot flash (cs1) */ + { (void __iomem *)0xe8000000, 0x00000000, 0x02000000, MT_DEVICE}, /* 32M main flash (cs0) */ + { (void __iomem *)0xea000000, 0x08000000, 0x02000000, MT_DEVICE}, /* 32M boot flash (cs1) */ }; static void __init collie_map_io(void) diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-sa1100/generic.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-sa1100/generic.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-sa1100/generic.c 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-sa1100/generic.c 2005-07-05 02:00:33.000000000 +0100 @@ -365,10 +365,10 @@ static struct map_desc standard_io_desc[] __initdata = { /* virtual physical length type */ - { 0xf8000000, 0x80000000, 0x00100000, MT_DEVICE }, /* PCM */ - { 0xfa000000, 0x90000000, 0x00100000, MT_DEVICE }, /* SCM */ - { 0xfc000000, 0xa0000000, 0x00100000, MT_DEVICE }, /* MER */ - { 0xfe000000, 0xb0000000, 0x00200000, MT_DEVICE } /* LCD + DMA */ + { (void __iomem *)0xf8000000, 0x80000000, 0x100000, MT_DEVICE }, /* PCM */ + { (void __iomem *)0xfa000000, 0x90000000, 0x100000, MT_DEVICE }, /* SCM */ + { (void __iomem *)0xfc000000, 0xa0000000, 0x100000, MT_DEVICE }, /* MER */ + { (void __iomem *)0xfe000000, 0xb0000000, 0x200000, MT_DEVICE } /* LCD + DMA */ }; void __init sa1100_map_io(void) diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-sa1100/hackkit.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-sa1100/hackkit.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-sa1100/hackkit.c 2005-07-05 01:59:39.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-sa1100/hackkit.c 2005-07-05 02:00:33.000000000 +0100 @@ -58,7 +58,7 @@ static struct map_desc hackkit_io_desc[] __initdata = { /* virtual physical length type */ - { 0xe8000000, 0x00000000, 0x01000000, MT_DEVICE } /* Flash bank 0 */ + { (void __iomem *)0xe8000000, 0x00000000, 0x01000000, MT_DEVICE } /* Flash bank 0 */ }; static struct sa1100_port_fns hackkit_port_fns __initdata = { diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-sa1100/jornada720.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-sa1100/jornada720.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-sa1100/jornada720.c 2005-07-05 01:59:39.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-sa1100/jornada720.c 2005-07-05 02:00:33.000000000 +0100 @@ -82,9 +82,9 @@ static struct map_desc jornada720_io_desc[] __initdata = { /* virtual physical length type */ - { 0xf0000000, 0x48000000, 0x00100000, MT_DEVICE }, /* Epson registers */ - { 0xf1000000, 0x48200000, 0x00100000, MT_DEVICE }, /* Epson frame buffer */ - { 0xf4000000, 0x40000000, 0x00100000, MT_DEVICE } /* SA-1111 */ + { (void __iomem *)0xf0000000, 0x48000000, 0x00100000, MT_DEVICE }, /* Epson registers */ + { (void __iomem *)0xf1000000, 0x48200000, 0x00100000, MT_DEVICE }, /* Epson frame buffer */ + { (void __iomem *)0xf4000000, 0x40000000, 0x00100000, MT_DEVICE } /* SA-1111 */ }; static void __init jornada720_map_io(void) diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-sa1100/lart.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-sa1100/lart.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-sa1100/lart.c 2005-07-05 01:59:39.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-sa1100/lart.c 2005-07-05 02:00:33.000000000 +0100 @@ -21,8 +21,8 @@ static struct map_desc lart_io_desc[] __initdata = { /* virtual physical length type */ - { 0xe8000000, 0x00000000, 0x00400000, MT_DEVICE }, /* main flash memory */ - { 0xec000000, 0x08000000, 0x00400000, MT_DEVICE } /* main flash, alternative location */ + { (void __iomem *)0xe8000000, 0x00000000, 0x00400000, MT_DEVICE }, /* main flash memory */ + { (void __iomem *)0xec000000, 0x08000000, 0x00400000, MT_DEVICE } /* main flash, alternative location */ }; static void __init lart_map_io(void) diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-sa1100/neponset.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-sa1100/neponset.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-sa1100/neponset.c 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-sa1100/neponset.c 2005-07-05 02:00:33.000000000 +0100 @@ -332,8 +332,8 @@ static struct map_desc neponset_io_desc[] __initdata = { /* virtual physical length type */ - { 0xf3000000, 0x10000000, SZ_1M, MT_DEVICE }, /* System Registers */ - { 0xf4000000, 0x40000000, SZ_1M, MT_DEVICE } /* SA-1111 */ + { (void __iomem *)0xf3000000, 0x10000000, SZ_1M, MT_DEVICE }, /* System Registers */ + { (void __iomem *)0xf4000000, 0x40000000, SZ_1M, MT_DEVICE } /* SA-1111 */ }; void __init neponset_map_io(void) diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mach-sa1100/simpad.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-sa1100/simpad.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mach-sa1100/simpad.c 2005-07-05 01:59:39.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mach-sa1100/simpad.c 2005-07-05 02:00:33.000000000 +0100 @@ -61,9 +61,9 @@ static struct map_desc simpad_io_desc[] __initdata = { /* virtual physical length type */ /* MQ200 */ - { 0xf2800000, 0x4b800000, 0x00800000, MT_DEVICE }, + { (void __iomem *)0xf2800000, 0x4b800000, 0x00800000, MT_DEVICE }, /* Paules CS3, write only */ - { 0xf1000000, 0x18000000, 0x00100000, MT_DEVICE }, + { (void __iomem *)0xf1000000, 0x18000000, 0x00100000, MT_DEVICE }, }; diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/arch/arm/mm/mm-armv.c linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mm/mm-armv.c --- linux-2.6.13-rc1-git6rmk/arch/arm/mm/mm-armv.c 2005-07-05 01:59:39.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/arch/arm/mm/mm-armv.c 2005-07-05 02:00:33.000000000 +0100 @@ -466,7 +466,7 @@ ecc_mask ? "en" : "dis", cp->policy); } -#define vectors_base() (vectors_high() ? 0xffff0000 : 0) +#define vectors_base() (vectors_high() ? (void __iomem *)0xffff0000 : (void __iomem *)0) /* * Create the page directory entries and any necessary @@ -482,18 +482,20 @@ pgprot_t prot_pte; long off; - if (md->virtual != vectors_base() && md->virtual < TASK_SIZE) { + if (md->virtual != vectors_base() && + md->virtual < (void __iomem *)TASK_SIZE) { printk(KERN_WARNING "BUG: not creating mapping for " "0x%08lx at 0x%08lx in user region\n", - md->physical, md->virtual); + md->physical, (unsigned long)md->virtual); return; } if ((md->type == MT_DEVICE || md->type == MT_ROM) && - md->virtual >= PAGE_OFFSET && md->virtual < VMALLOC_END) { + md->virtual >= (void __iomem *)PAGE_OFFSET && + md->virtual < (void __iomem *)VMALLOC_END) { printk(KERN_WARNING "BUG: mapping for 0x%08lx at 0x%08lx " "overlaps vmalloc space\n", - md->physical, md->virtual); + md->physical, (unsigned long)md->virtual); } domain = mem_types[md->type].domain; @@ -501,7 +503,7 @@ prot_l1 = mem_types[md->type].prot_l1 | PMD_DOMAIN(domain); prot_sect = mem_types[md->type].prot_sect | PMD_DOMAIN(domain); - virt = md->virtual; + virt = (unsigned long)md->virtual; off = md->physical - virt; length = md->length; @@ -509,7 +511,7 @@ (virt & 0xfffff || (virt + off) & 0xfffff || (virt + length) & 0xfffff)) { printk(KERN_WARNING "BUG: map for 0x%08lx at 0x%08lx can not " "be mapped using pages, ignoring.\n", - md->physical, md->virtual); + md->physical, (unsigned long)md->virtual); return; } @@ -623,7 +625,7 @@ continue; p->physical = mi->bank[i].start; - p->virtual = __phys_to_virt(p->physical); + p->virtual = (void __iomem *)__phys_to_virt(p->physical); p->length = mi->bank[i].size; p->type = MT_MEMORY; p ++; @@ -651,13 +653,13 @@ */ q = init_maps; do { - if (address < q->virtual || q == p) { + if ((void __iomem *)address < q->virtual || q == p) { clear_mapping(address); address += PGDIR_SIZE; } else { create_mapping(q); - address = q->virtual + q->length; + address = (unsigned long)q->virtual + q->length; address = (address + PGDIR_SIZE - 1) & PGDIR_MASK; q ++; @@ -670,13 +672,13 @@ * create a mapping at the low-vectors virtual address. */ init_maps->physical = virt_to_phys(init_maps); - init_maps->virtual = 0xffff0000; + init_maps->virtual = (void __iomem *)0xffff0000; init_maps->length = PAGE_SIZE; init_maps->type = MT_HIGH_VECTORS; create_mapping(init_maps); if (!vectors_high()) { - init_maps->virtual = 0; + init_maps->virtual = (void __iomem *)0; init_maps->type = MT_LOW_VECTORS; create_mapping(init_maps); } diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-cl7500/hardware.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-cl7500/hardware.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-cl7500/hardware.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-cl7500/hardware.h 2005-07-05 02:00:33.000000000 +0100 @@ -37,15 +37,15 @@ #define ISA_START 0x0c000000 /* ISA */ #define ISA_SIZE 0x00010000 -#define ISA_BASE 0xe1000000 +#define ISA_BASE IOMEM(0xe1000000) #define FLASH_START 0x01000000 /* XXX */ #define FLASH_SIZE 0x01000000 -#define FLASH_BASE 0xe2000000 +#define FLASH_BASE IOMEM(0xe2000000) #define LED_START 0x0302B000 #define LED_SIZE 0x00001000 -#define LED_BASE 0xe3000000 +#define LED_BASE IOMEM(0xe3000000) #define LED_ADDRESS (LED_BASE + 0xa00) /* Let's define SCREEN_START for CL7500, even though it's a lie. */ @@ -53,7 +53,7 @@ #define SCREEN_END 0xdfc00000 #define SCREEN_BASE 0xdf800000 -#define FLUSH_BASE 0xdf000000 +#define FLUSH_BASE IOMEM(0xdf000000) #define VIDC_BASE (void __iomem *)0xe0400000 #define IOMD_BASE IOMEM(0xe0200000) diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-clps711x/autcpu12.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-clps711x/autcpu12.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-clps711x/autcpu12.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-clps711x/autcpu12.h 2005-07-05 02:00:33.000000000 +0100 @@ -25,7 +25,7 @@ * (nCS2). This is the mapping for it. */ #define AUTCPU12_PHYS_CS8900A CS2_PHYS_BASE /* physical */ -#define AUTCPU12_VIRT_CS8900A (0xfe000000) /* virtual */ +#define AUTCPU12_VIRT_CS8900A ((void __iomem *)0xfe000000) /* virtual */ /* * The flash bank is wired to chip select 0 diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-clps711x/hardware.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-clps711x/hardware.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-clps711x/hardware.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-clps711x/hardware.h 2005-07-05 02:00:33.000000000 +0100 @@ -24,7 +24,7 @@ #include -#define CLPS7111_VIRT_BASE 0xff000000 +#define CLPS7111_VIRT_BASE ASM_IOMEM(0xff000000) #define CLPS7111_BASE CLPS7111_VIRT_BASE /* @@ -67,7 +67,7 @@ #endif -#define SYSPLD_VIRT_BASE 0xfe000000 +#define SYSPLD_VIRT_BASE (void __iomem *)0xfe000000 #define SYSPLD_BASE SYSPLD_VIRT_BASE #ifndef __ASSEMBLER__ @@ -116,7 +116,7 @@ #define ETHER_START 0x20000000 #define ETHER_SIZE 0x1000 -#define ETHER_BASE 0xfe000000 +#define ETHER_BASE (void __iomem *)0xfe000000 #endif @@ -131,9 +131,9 @@ * was cause for much consternation and headscratching. This should probably * be made a compile/run time kernel option. */ -#define EP7211_PHYS_EXTKBD CS3_PHYS_BASE /* physical */ +#define EP7211_PHYS_EXTKBD CS3_PHYS_BASE /* physical */ -#define EP7211_VIRT_EXTKBD (0xfd000000) /* virtual */ +#define EP7211_VIRT_EXTKBD ((void __iomem *)0xfd000000) /* virtual */ /* @@ -144,9 +144,9 @@ * was cause for much consternation and headscratching. This should probably * be made a compile/run time kernel option. */ -#define EP7211_PHYS_CS8900A CS2_PHYS_BASE /* physical */ +#define EP7211_PHYS_CS8900A CS2_PHYS_BASE /* physical */ -#define EP7211_VIRT_CS8900A (0xfc000000) /* virtual */ +#define EP7211_VIRT_CS8900A ((void __iomem *)0xfc000000) /* virtual */ /* @@ -156,11 +156,11 @@ * nCS0 and nCS1 are at 0x70000000 and 0x60000000, respectively, when running * in jumpered boot mode. */ -#define EP7211_PHYS_FLASH1 CS0_PHYS_BASE /* physical */ -#define EP7211_PHYS_FLASH2 CS1_PHYS_BASE /* physical */ +#define EP7211_PHYS_FLASH1 CS0_PHYS_BASE /* physical */ +#define EP7211_PHYS_FLASH2 CS1_PHYS_BASE /* physical */ -#define EP7211_VIRT_FLASH1 (0xfa000000) /* virtual */ -#define EP7211_VIRT_FLASH2 (0xfb000000) /* virtual */ +#define EP7211_VIRT_FLASH1 ((void __iomem *)0xfa000000) /* virtual */ +#define EP7211_VIRT_FLASH2 ((void __iomem *)0xfb000000) /* virtual */ #endif /* CONFIG_ARCH_EDB7211 */ @@ -211,7 +211,7 @@ * SED1355 LCD controller */ #define CEIVA_PHYS_SED1355 CS2_PHYS_BASE -#define CEIVA_VIRT_SED1355 (0xfc000000) +#define CEIVA_VIRT_SED1355 ((void __iomem *)0xfc000000) /* * Relevant bits in port D, which controls power to the various parts of diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-clps711x/system.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-clps711x/system.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-clps711x/system.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-clps711x/system.h 2005-07-05 02:00:33.000000000 +0100 @@ -20,6 +20,7 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H +#include #include static inline void arch_idle(void) diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-ebsa110/hardware.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-ebsa110/hardware.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-ebsa110/hardware.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-ebsa110/hardware.h 2005-07-05 02:00:33.000000000 +0100 @@ -48,17 +48,17 @@ #define TRICK6_PHYS 0xf3800000 #define TRICK7_PHYS 0xf3c00000 -#define ISAMEM_BASE 0xe0000000 -#define ISAIO_BASE 0xf0000000 +#define ISAMEM_BASE (void __iomem *)0xe0000000 +#define ISAIO_BASE (void __iomem *)0xf0000000 -#define PIT_BASE 0xfc000000 -#define SOFT_BASE 0xfd000000 +#define PIT_BASE (void __iomem *)0xfc000000 +#define SOFT_BASE (void __iomem *)0xfd000000 /* * RAM definitions */ #define FLUSH_BASE_PHYS 0x40000000 -#define FLUSH_BASE 0xdf000000 +#define FLUSH_BASE ASM_IOMEM(0xdf000000) #define UNCACHEABLE_ADDR 0xff000000 /* IRQ_STAT */ diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-ebsa285/hardware.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-ebsa285/hardware.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-ebsa285/hardware.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-ebsa285/hardware.h 2005-07-05 02:00:33.000000000 +0100 @@ -28,53 +28,53 @@ * 0xf0000000 0x80000000 16MB ISA memory */ #define XBUS_SIZE 0x00100000 -#define XBUS_BASE 0xff800000 +#define XBUS_BASE ASM_IOMEM(0xff800000) #define PCIO_SIZE 0x00100000 -#define PCIO_BASE 0xff000000 +#define PCIO_BASE ASM_IOMEM(0xff000000) #define ARMCSR_SIZE 0x00100000 -#define ARMCSR_BASE 0xfe000000 +#define ARMCSR_BASE ASM_IOMEM(0xfe000000) #define WFLUSH_SIZE 0x00100000 #define WFLUSH_BASE 0xfd000000 #define PCIIACK_SIZE 0x00100000 -#define PCIIACK_BASE 0xfc000000 +#define PCIIACK_BASE ASM_IOMEM(0xfc000000) #define PCICFG1_SIZE 0x01000000 -#define PCICFG1_BASE 0xfb000000 +#define PCICFG1_BASE ASM_IOMEM(0xfb000000) #define PCICFG0_SIZE 0x01000000 -#define PCICFG0_BASE 0xfa000000 +#define PCICFG0_BASE ASM_IOMEM(0xfa000000) #define FLUSH_SIZE 0x00100000 -#define FLUSH_BASE 0xf9000000 +#define FLUSH_BASE ASM_IOMEM(0xf9000000) #define PCIMEM_SIZE 0x01000000 -#define PCIMEM_BASE 0xf0000000 +#define PCIMEM_BASE ASM_IOMEM(0xf0000000) #elif defined(CONFIG_ARCH_CO285) /* * This is the COEBSA285 cut-down mapping */ #define PCIMEM_SIZE 0x80000000 -#define PCIMEM_BASE 0x80000000 +#define PCIMEM_BASE ASM_IOMEM(0x80000000) #define FLUSH_SIZE 0x00100000 -#define FLUSH_BASE 0x7e000000 +#define FLUSH_BASE ASM_IOMEM(0x7e000000) #define WFLUSH_SIZE 0x01000000 #define WFLUSH_BASE 0x7d000000 #define ARMCSR_SIZE 0x00100000 -#define ARMCSR_BASE 0x7cf00000 +#define ARMCSR_BASE ASM_IOMEM(0x7cf00000) #define XBUS_SIZE 0x00020000 -#define XBUS_BASE 0x7cee0000 +#define XBUS_BASE ASM_IOMEM(0x7cee0000) #define PCIO_SIZE 0x00010000 -#define PCIO_BASE 0x7ced0000 +#define PCIO_BASE ASM_IOMEM(0x7ced0000) #else diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-epxa10db/hardware.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-epxa10db/hardware.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-epxa10db/hardware.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-epxa10db/hardware.h 2005-07-05 02:00:33.000000000 +0100 @@ -33,7 +33,7 @@ #define IO_SIZE 0x10000000 // How much? #define IO_START EXC_REGISTERS_BASE // PA of IO /* macro to get at IO space when running virtually */ -#define IO_ADDRESS(x) ((x) | 0xf0000000) +#define IO_ADDRESS(x) ASM_IOMEM((x) | 0xf0000000) #define FLASH_VBASE 0xFE000000 #define FLASH_SIZE 0x01000000 diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-integrator/hardware.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-integrator/hardware.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-integrator/hardware.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-integrator/hardware.h 2005-07-05 02:00:33.000000000 +0100 @@ -29,7 +29,7 @@ * Where in virtual memory the IO devices (timers, system controllers * and so on) */ -#define IO_BASE 0xF0000000 // VA of IO +#define IO_BASE ASM_IOMEM(0xF0000000) // VA of IO #define IO_SIZE 0x0B000000 // How much? #define IO_START INTEGRATOR_HDR_BASE // PA of IO @@ -37,10 +37,10 @@ * Similar to above, but for PCI addresses (memory, IO, Config and the * V3 chip itself). WARNING: this has to mirror definitions in platform.h */ -#define PCI_MEMORY_VADDR 0xe8000000 -#define PCI_CONFIG_VADDR 0xec000000 -#define PCI_V3_VADDR 0xed000000 -#define PCI_IO_VADDR 0xee000000 +#define PCI_MEMORY_VADDR (void __iomem *)0xe8000000 +#define PCI_CONFIG_VADDR (void __iomem *)0xec000000 +#define PCI_V3_VADDR (void __iomem *)0xed000000 +#define PCI_IO_VADDR (void __iomem *)0xee000000 #define PCIO_BASE PCI_IO_VADDR #define PCIMEM_BASE PCI_MEMORY_VADDR diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-iop3xx/iop321.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-iop3xx/iop321.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-iop3xx/iop321.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-iop3xx/iop321.h 2005-07-05 02:00:33.000000000 +0100 @@ -33,7 +33,7 @@ */ #define IOP321_PCI_IO_WINDOW_SIZE 0x00010000 #define IOP321_PCI_LOWER_IO_PA 0x90000000 -#define IOP321_PCI_LOWER_IO_VA 0xfe000000 +#define IOP321_PCI_LOWER_IO_VA (void __iomem *)0xfe000000 #define IOP321_PCI_LOWER_IO_BA (*IOP321_OIOWTVR) #define IOP321_PCI_UPPER_IO_PA (IOP321_PCI_LOWER_IO_PA + IOP321_PCI_IO_WINDOW_SIZE - 1) #define IOP321_PCI_UPPER_IO_VA (IOP321_PCI_LOWER_IO_VA + IOP321_PCI_IO_WINDOW_SIZE - 1) @@ -52,9 +52,9 @@ /* * IOP321 chipset registers */ -#define IOP321_VIRT_MEM_BASE 0xfeffe000 /* chip virtual mem address*/ +#define IOP321_VIRT_MEM_BASE (void __iomem *)0xfeffe000 /* chip virtual mem address*/ #define IOP321_PHYS_MEM_BASE 0xffffe000 /* chip physical memory address */ -#define IOP321_REG_ADDR(reg) (IOP321_VIRT_MEM_BASE | (reg)) +#define IOP321_REG_ADDR(reg) (IOP321_VIRT_MEM_BASE + (reg)) /* Reserved 0x00000000 through 0x000000FF */ diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-iop3xx/iop331.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-iop3xx/iop331.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-iop3xx/iop331.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-iop3xx/iop331.h 2005-07-05 02:00:33.000000000 +0100 @@ -33,7 +33,7 @@ */ #define IOP331_PCI_IO_WINDOW_SIZE 0x00010000 #define IOP331_PCI_LOWER_IO_PA 0x90000000 -#define IOP331_PCI_LOWER_IO_VA 0xfe000000 +#define IOP331_PCI_LOWER_IO_VA (void __iomem *)0xfe000000 #define IOP331_PCI_LOWER_IO_BA (*IOP331_OIOWTVR) #define IOP331_PCI_UPPER_IO_PA (IOP331_PCI_LOWER_IO_PA + IOP331_PCI_IO_WINDOW_SIZE - 1) #define IOP331_PCI_UPPER_IO_VA (IOP331_PCI_LOWER_IO_VA + IOP331_PCI_IO_WINDOW_SIZE - 1) @@ -52,9 +52,9 @@ /* * IOP331 chipset registers */ -#define IOP331_VIRT_MEM_BASE 0xfeffe000 /* chip virtual mem address*/ +#define IOP331_VIRT_MEM_BASE (void __iomem *)0xfeffe000 /* chip virtual mem address*/ #define IOP331_PHYS_MEM_BASE 0xffffe000 /* chip physical memory address */ -#define IOP331_REG_ADDR(reg) (IOP331_VIRT_MEM_BASE | (reg)) +#define IOP331_REG_ADDR(reg) (IOP331_VIRT_MEM_BASE + (reg)) /* Reserved 0x00000000 through 0x000000FF */ @@ -341,8 +341,8 @@ #define IOP331_UART0_PHYS (IOP331_PHYS_MEM_BASE | 0x00001700) /* UART #1 physical */ #define IOP331_UART1_PHYS (IOP331_PHYS_MEM_BASE | 0x00001740) /* UART #2 physical */ -#define IOP331_UART0_VIRT (IOP331_VIRT_MEM_BASE | 0x00001700) /* UART #1 virtual addr */ -#define IOP331_UART1_VIRT (IOP331_VIRT_MEM_BASE | 0x00001740) /* UART #2 virtual addr */ +#define IOP331_UART0_VIRT (IOP331_VIRT_MEM_BASE + 0x00001700) /* UART #1 virtual addr */ +#define IOP331_UART1_VIRT (IOP331_VIRT_MEM_BASE + 0x00001740) /* UART #2 virtual addr */ /* Reserved 0x00001770 through 0x0000177F */ diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-iop3xx/iq31244.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-iop3xx/iq31244.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-iop3xx/iq31244.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-iop3xx/iq31244.h 2005-07-05 02:00:33.000000000 +0100 @@ -11,7 +11,7 @@ #define IQ31244_FLASHSIZE 0x00800000 #define IQ31244_FLASHWIDTH 2 -#define IQ31244_UART 0xfe800000 /* UART #1 */ +#define IQ31244_UART (void __iomem *)0xfe800000 /* UART #1 */ #define IQ31244_7SEG_1 0xfe840000 /* 7-Segment MSB */ #define IQ31244_7SEG_0 0xfe850000 /* 7-Segment LSB (WO) */ #define IQ31244_ROTARY_SW 0xfe8d0000 /* Rotary Switch */ diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-iop3xx/iq80321.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-iop3xx/iq80321.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-iop3xx/iq80321.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-iop3xx/iq80321.h 2005-07-05 02:00:33.000000000 +0100 @@ -11,7 +11,7 @@ #define IQ80321_FLASHSIZE 0x00800000 #define IQ80321_FLASHWIDTH 1 -#define IQ80321_UART 0xfe800000 /* UART #1 */ +#define IQ80321_UART (void __iomem *)0xfe800000 /* UART #1 */ #define IQ80321_7SEG_1 0xfe840000 /* 7-Segment MSB */ #define IQ80321_7SEG_0 0xfe850000 /* 7-Segment LSB (WO) */ #define IQ80321_ROTARY_SW 0xfe8d0000 /* Rotary Switch */ diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-ixp2000/io.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-ixp2000/io.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-ixp2000/io.h 2005-06-30 12:51:28.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-ixp2000/io.h 2005-07-05 02:00:33.000000000 +0100 @@ -126,6 +126,8 @@ #define ioport_unmap(addr) #else #define __io(p) ((void __iomem *)((p)+IXP2000_PCI_IO_VIRT_BASE)) +#define ___io(x) __io(x) +#define alignw(x) (void __iomem *)(x) #endif diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-ixp2000/ixdp2x00.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-ixp2000/ixdp2x00.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-ixp2000/ixdp2x00.h 2005-06-30 12:51:28.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-ixp2000/ixdp2x00.h 2005-07-05 02:00:33.000000000 +0100 @@ -21,12 +21,12 @@ * On board CPLD memory map */ #define IXDP2X00_PHYS_CPLD_BASE 0xc7000000 -#define IXDP2X00_VIRT_CPLD_BASE 0xfe000000 +#define IXDP2X00_VIRT_CPLD_BASE (void __iomem *)0xfe000000 #define IXDP2X00_CPLD_SIZE 0x00100000 #define IXDP2X00_CPLD_REG(x) \ - (volatile unsigned long *)(IXDP2X00_VIRT_CPLD_BASE | x) + (volatile unsigned long *)(IXDP2X00_VIRT_CPLD_BASE + (x)) /* * IXDP2400 CPLD registers diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-ixp2000/ixdp2x01.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-ixp2000/ixdp2x01.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-ixp2000/ixdp2x01.h 2005-06-30 12:51:28.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-ixp2000/ixdp2x01.h 2005-07-05 02:00:33.000000000 +0100 @@ -18,10 +18,10 @@ #define __IXDP2X01_H__ #define IXDP2X01_PHYS_CPLD_BASE 0xc6024000 -#define IXDP2X01_VIRT_CPLD_BASE 0xfe000000 +#define IXDP2X01_VIRT_CPLD_BASE (void __iomem *)0xfe000000 #define IXDP2X01_CPLD_REGION_SIZE 0x00100000 -#define IXDP2X01_CPLD_VIRT_REG(reg) (volatile unsigned long*)(IXDP2X01_VIRT_CPLD_BASE | reg) +#define IXDP2X01_CPLD_VIRT_REG(reg) (volatile unsigned long*)(IXDP2X01_VIRT_CPLD_BASE + (reg)) #define IXDP2X01_CPLD_PHYS_REG(reg) (volatile u32*)(IXDP2X01_PHYS_CPLD_BASE | reg) #define IXDP2X01_UART1_VIRT_BASE IXDP2X01_CPLD_VIRT_REG(0x40) diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-ixp2000/ixp2000-regs.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-ixp2000/ixp2000-regs.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-ixp2000/ixp2000-regs.h 2005-06-30 12:51:28.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-ixp2000/ixp2000-regs.h 2005-07-05 02:00:33.000000000 +0100 @@ -55,7 +55,7 @@ */ #define IXP2000_CAP_PHYS_BASE 0xc0000000 -#define IXP2000_CAP_VIRT_BASE 0xfef00000 +#define IXP2000_CAP_VIRT_BASE (void __iomem *)0xfef00000 #define IXP2000_CAP_SIZE 0x00100000 /* @@ -75,31 +75,31 @@ * the change. */ #define IXP2000_INTCTL_PHYS_BASE 0xd6000000 -#define IXP2000_INTCTL_VIRT_BASE 0xfee00000 +#define IXP2000_INTCTL_VIRT_BASE (void __iomem *)0xfee00000 #define IXP2000_INTCTL_SIZE 0x00100000 #define IXP2000_PCI_CREG_PHYS_BASE 0xde000000 -#define IXP2000_PCI_CREG_VIRT_BASE 0xfed00000 +#define IXP2000_PCI_CREG_VIRT_BASE (void __iomem *)0xfed00000 #define IXP2000_PCI_CREG_SIZE 0x00100000 #define IXP2000_PCI_CSR_PHYS_BASE 0xdf000000 -#define IXP2000_PCI_CSR_VIRT_BASE 0xfec00000 +#define IXP2000_PCI_CSR_VIRT_BASE (void __iomem *)0xfec00000 #define IXP2000_PCI_CSR_SIZE 0x00100000 #define IXP2000_MSF_PHYS_BASE 0xc8000000 -#define IXP2000_MSF_VIRT_BASE 0xfeb00000 +#define IXP2000_MSF_VIRT_BASE (void __iomem *)0xfeb00000 #define IXP2000_MSF_SIZE 0x00100000 #define IXP2000_PCI_IO_PHYS_BASE 0xd8000000 -#define IXP2000_PCI_IO_VIRT_BASE 0xfd000000 +#define IXP2000_PCI_IO_VIRT_BASE (void __iomem *)0xfd000000 #define IXP2000_PCI_IO_SIZE 0x01000000 #define IXP2000_PCI_CFG0_PHYS_BASE 0xda000000 -#define IXP2000_PCI_CFG0_VIRT_BASE 0xfc000000 +#define IXP2000_PCI_CFG0_VIRT_BASE (void __iomem *)0xfc000000 #define IXP2000_PCI_CFG0_SIZE 0x01000000 #define IXP2000_PCI_CFG1_PHYS_BASE 0xdb000000 -#define IXP2000_PCI_CFG1_VIRT_BASE 0xfb000000 +#define IXP2000_PCI_CFG1_VIRT_BASE (void __iomem *)0xfb000000 #define IXP2000_PCI_CFG1_SIZE 0x01000000 /* @@ -137,7 +137,7 @@ /* * Interrupt controller registers */ -#define IXP2000_INTCTL_REG(x) (volatile unsigned long*)(IXP2000_INTCTL_VIRT_BASE | (x)) +#define IXP2000_INTCTL_REG(x) (volatile unsigned long*)(IXP2000_INTCTL_VIRT_BASE + (x)) #define IXP2000_IRQ_STATUS IXP2000_INTCTL_REG(0x08) #define IXP2000_IRQ_ENABLE IXP2000_INTCTL_REG(0x10) #define IXP2000_IRQ_ENABLE_SET IXP2000_INTCTL_REG(0x10) @@ -181,7 +181,7 @@ /* * PCI config register access from core */ -#define IXP2000_PCI_CREG(x) (volatile unsigned long*)(IXP2000_PCI_CREG_VIRT_BASE | (x)) +#define IXP2000_PCI_CREG(x) (volatile unsigned long*)(IXP2000_PCI_CREG_VIRT_BASE + (x)) #define IXP2000_PCI_CMDSTAT IXP2000_PCI_CREG(0x04) #define IXP2000_PCI_CSR_BAR IXP2000_PCI_CREG(0x10) #define IXP2000_PCI_SRAM_BAR IXP2000_PCI_CREG(0x14) @@ -190,7 +190,7 @@ /* * PCI CSRs */ -#define IXP2000_PCI_CSR(x) (volatile unsigned long*)(IXP2000_PCI_CSR_VIRT_BASE | (x)) +#define IXP2000_PCI_CSR(x) (volatile unsigned long*)(IXP2000_PCI_CSR_VIRT_BASE + (x)) /* * PCI outbound interrupts @@ -274,7 +274,7 @@ * ports, slave microprocessors, CPLDs, and others of chip memory mapped * peripherals. */ -#define SLOWPORT_CSR(x) (volatile unsigned long*)(IXP2000_SLOWPORT_CSR_VIRT_BASE | (x)) +#define SLOWPORT_CSR(x) (volatile unsigned long*)(IXP2000_SLOWPORT_CSR_VIRT_BASE + (x)) #define IXP2000_SLOWPORT_CCR SLOWPORT_CSR(0x00) #define IXP2000_SLOWPORT_WTC1 SLOWPORT_CSR(0x04) diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h 2005-06-30 12:51:28.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h 2005-07-05 02:00:33.000000000 +0100 @@ -52,21 +52,21 @@ * Expansion BUS Configuration registers */ #define IXP4XX_EXP_CFG_BASE_PHYS (0xC4000000) -#define IXP4XX_EXP_CFG_BASE_VIRT (0xFFBFD000) +#define IXP4XX_EXP_CFG_BASE_VIRT (void __iomem *)(0xFFBFD000) #define IXP4XX_EXP_CFG_REGION_SIZE (0x00001000) /* * PCI Config registers */ #define IXP4XX_PCI_CFG_BASE_PHYS (0xC0000000) -#define IXP4XX_PCI_CFG_BASE_VIRT (0xFFBFE000) +#define IXP4XX_PCI_CFG_BASE_VIRT (void __iomem *)(0xFFBFE000) #define IXP4XX_PCI_CFG_REGION_SIZE (0x00001000) /* * Peripheral space */ #define IXP4XX_PERIPHERAL_BASE_PHYS (0xC8000000) -#define IXP4XX_PERIPHERAL_BASE_VIRT (0xFFBF2000) +#define IXP4XX_PERIPHERAL_BASE_VIRT ASM_IOMEM(0xFFBF2000) #define IXP4XX_PERIPHERAL_REGION_SIZE (0x0000C000) /* @@ -76,7 +76,7 @@ * aligned so that it * can be used with the low-level debug code. */ #define IXP4XX_DEBUG_UART_BASE_PHYS (0xC8000000) -#define IXP4XX_DEBUG_UART_BASE_VIRT (0xffb00000) +#define IXP4XX_DEBUG_UART_BASE_VIRT ASM_IOMEM(0xffb00000) #define IXP4XX_DEBUG_UART_REGION_SIZE (0x00001000) #define IXP4XX_EXP_CS0_OFFSET 0x00 diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-l7200/hardware.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-l7200/hardware.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-l7200/hardware.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-l7200/hardware.h 2005-07-05 02:00:33.000000000 +0100 @@ -30,30 +30,30 @@ #define IO_START 0x80000000 /* I/O */ #define IO_SIZE 0x01000000 -#define IO_BASE 0xd0000000 +#define IO_BASE ASM_IOMEM(0xd0000000) #define IO_START_2 0x90000000 /* I/O */ #define IO_SIZE_2 0x01000000 -#define IO_BASE_2 0xd1000000 +#define IO_BASE_2 ASM_IOMEM(0xd1000000) #define AUX_START 0x1a000000 /* AUX PORT */ #define AUX_SIZE 0x01000000 -#define AUX_BASE 0xd2000000 +#define AUX_BASE ASM_IOMEM(0xd2000000) #define FLASH1_START 0x00000000 /* FLASH BANK 1 */ #define FLASH1_SIZE 0x01000000 -#define FLASH1_BASE 0xd3000000 +#define FLASH1_BASE ASM_IOMEM(0xd3000000) #define FLASH2_START 0x10000000 /* FLASH BANK 2 */ #define FLASH2_SIZE 0x01000000 -#define FLASH2_BASE 0xd4000000 +#define FLASH2_BASE ASM_IOMEM(0xd4000000) #define ISA_START 0x20000000 /* ISA */ #define ISA_SIZE 0x20000000 #define ISA_BASE 0xe0000000 #define FLUSH_BASE_PHYS 0x40000000 /* ROM */ -#define FLUSH_BASE 0xdf000000 +#define FLUSH_BASE ASM_IOMEM(0xdf000000) #define PCIO_BASE IO_BASE diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-lh7a40x/constants.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-lh7a40x/constants.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-lh7a40x/constants.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-lh7a40x/constants.h 2005-07-05 02:00:33.000000000 +0100 @@ -18,12 +18,12 @@ /* SoC CPU IO addressing */ #define IO_PHYS (0x80000000) -#define IO_VIRT (0xf8000000) +#define IO_VIRT (void __iomem *)(0xf8000000) #define IO_SIZE (0x0000B000) #ifdef CONFIG_MACH_KEV7A400 # define CPLD_PHYS (0x20000000) -# define CPLD_VIRT (0xf2000000) +# define CPLD_VIRT (void __iomem *)(0xf2000000) # define CPLD_SIZE PAGE_SIZE #endif @@ -31,16 +31,16 @@ # define IOBARRIER_PHYS 0xc0000000 /* Start of SDRAM */ /*# define IOBARRIER_PHYS 0x00000000 */ /* Start of flash */ -# define IOBARRIER_VIRT 0xf0000000 +# define IOBARRIER_VIRT (void __iomem *)0xf0000000 # define IOBARRIER_SIZE PAGE_SIZE # define CF_PHYS 0x60200000 -# define CF_VIRT 0xf6020000 +# define CF_VIRT (void __iomem *)0xf6020000 # define CF_SIZE (8*1024) /* The IO mappings for the LPD CPLD are, unfortunately, sparse. */ # define CPLDX_PHYS(x) (0x70000000 | ((x) << 20)) -# define CPLDX_VIRT(x) (0xf7000000 | ((x) << 16)) +# define CPLDX_VIRT(x) ((void __iomem *)0xf7000000 + ((x) << 16)) # define CPLD00_PHYS CPLDX_PHYS (0x00) /* Wired LAN */ # define CPLD00_VIRT CPLDX_VIRT (0x00) # define CPLD00_SIZE PAGE_SIZE diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-omap/board-osk.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-omap/board-osk.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-omap/board-osk.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-omap/board-osk.h 2005-07-05 02:00:33.000000000 +0100 @@ -33,7 +33,7 @@ #define OMAP_OSK_ETHR_START 0x04800300 /* Micron NOR flash at CS3 mapped to address 0x0 if BM bit is 1 */ -#define OMAP_OSK_NOR_FLASH_BASE 0xD8000000 +#define OMAP_OSK_NOR_FLASH_BASE (void __iomem *)0xD8000000 #define OMAP_OSK_NOR_FLASH_SIZE SZ_32M #define OMAP_OSK_NOR_FLASH_START 0x00000000 diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-omap/fpga.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-omap/fpga.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-omap/fpga.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-omap/fpga.h 2005-07-05 02:00:33.000000000 +0100 @@ -34,7 +34,7 @@ * --------------------------------------------------------------------------- */ /* maps in the FPGA registers and the ETHR registers */ -#define H2P2_DBG_FPGA_BASE 0xE8000000 /* VA */ +#define H2P2_DBG_FPGA_BASE (void __iomem *)0xE8000000 /* VA */ #define H2P2_DBG_FPGA_SIZE SZ_4K /* SIZE */ #define H2P2_DBG_FPGA_START 0x04000000 /* PA */ @@ -83,7 +83,7 @@ * OMAP-1510 FPGA * --------------------------------------------------------------------------- */ -#define OMAP1510_FPGA_BASE 0xE8000000 /* Virtual */ +#define OMAP1510_FPGA_BASE (void __iomem *)0xE8000000 #define OMAP1510_FPGA_SIZE SZ_4K #define OMAP1510_FPGA_START 0x08000000 /* Physical */ diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-omap/omap1510.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-omap/omap1510.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-omap/omap1510.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-omap/omap1510.h 2005-07-05 02:00:33.000000000 +0100 @@ -36,15 +36,15 @@ /* Syntax: XX_BASE = Virtual base address, XX_START = Physical base address */ -#define OMAP1510_SRAM_BASE 0xD0000000 +#define OMAP1510_SRAM_BASE (void __iomem *)0xD0000000 #define OMAP1510_SRAM_SIZE (SZ_128K + SZ_64K) #define OMAP1510_SRAM_START 0x20000000 -#define OMAP1510_DSP_BASE 0xE0000000 +#define OMAP1510_DSP_BASE (void __iomem *)0xE0000000 #define OMAP1510_DSP_SIZE 0x28000 #define OMAP1510_DSP_START 0xE0000000 -#define OMAP1510_DSPREG_BASE 0xE1000000 +#define OMAP1510_DSPREG_BASE (void __iomem *)0xE1000000 #define OMAP1510_DSPREG_SIZE SZ_128K #define OMAP1510_DSPREG_START 0xE1000000 diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-omap/omap16xx.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-omap/omap16xx.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-omap/omap16xx.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-omap/omap16xx.h 2005-07-05 02:00:33.000000000 +0100 @@ -36,16 +36,16 @@ /* Syntax: XX_BASE = Virtual base address, XX_START = Physical base address */ -#define OMAP16XX_SRAM_BASE 0xD0000000 +#define OMAP16XX_SRAM_BASE (void __iomem *)0xD0000000 #define OMAP1610_SRAM_SIZE (SZ_16K) #define OMAP5912_SRAM_SIZE 0x3E800 #define OMAP16XX_SRAM_START 0x20000000 -#define OMAP16XX_DSP_BASE 0xE0000000 +#define OMAP16XX_DSP_BASE (void __iomem *)0xE0000000 #define OMAP16XX_DSP_SIZE 0x28000 #define OMAP16XX_DSP_START 0xE0000000 -#define OMAP16XX_DSPREG_BASE 0xE1000000 +#define OMAP16XX_DSPREG_BASE (void __iomem *)0xE1000000 #define OMAP16XX_DSPREG_SIZE SZ_128K #define OMAP16XX_DSPREG_START 0xE1000000 diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-omap/omap730.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-omap/omap730.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-omap/omap730.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-omap/omap730.h 2005-07-05 02:00:33.000000000 +0100 @@ -36,15 +36,15 @@ /* Syntax: XX_BASE = Virtual base address, XX_START = Physical base address */ -#define OMAP730_SRAM_BASE 0xD0000000 +#define OMAP730_SRAM_BASE (void __iomem *)0xD0000000 #define OMAP730_SRAM_SIZE (SZ_128K + SZ_64K + SZ_8K) #define OMAP730_SRAM_START 0x20000000 -#define OMAP730_DSP_BASE 0xE0000000 +#define OMAP730_DSP_BASE (void __iomem *)0xE0000000 #define OMAP730_DSP_SIZE 0x50000 #define OMAP730_DSP_START 0xE0000000 -#define OMAP730_DSPREG_BASE 0xE1000000 +#define OMAP730_DSPREG_BASE (void __iomem *)0xE1000000 #define OMAP730_DSPREG_SIZE SZ_128K #define OMAP730_DSPREG_START 0xE1000000 diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-pxa/lubbock.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-pxa/lubbock.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-pxa/lubbock.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-pxa/lubbock.h 2005-07-05 02:00:33.000000000 +0100 @@ -13,7 +13,7 @@ #define LUBBOCK_ETH_PHYS PXA_CS3_PHYS #define LUBBOCK_FPGA_PHYS PXA_CS2_PHYS -#define LUBBOCK_FPGA_VIRT (0xf0000000) +#define LUBBOCK_FPGA_VIRT ((void __iomem *)0xf0000000) #define LUB_P2V(x) ((x) - LUBBOCK_FPGA_PHYS + LUBBOCK_FPGA_VIRT) #define LUB_V2P(x) ((x) - LUBBOCK_FPGA_VIRT + LUBBOCK_FPGA_PHYS) diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-pxa/mainstone.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-pxa/mainstone.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-pxa/mainstone.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-pxa/mainstone.h 2005-07-05 02:00:33.000000000 +0100 @@ -16,7 +16,7 @@ #define MST_ETH_PHYS PXA_CS4_PHYS #define MST_FPGA_PHYS PXA_CS2_PHYS -#define MST_FPGA_VIRT (0xf0000000) +#define MST_FPGA_VIRT ((void __iomem *)0xf0000000) #define MST_P2V(x) ((x) - MST_FPGA_PHYS + MST_FPGA_VIRT) #define MST_V2P(x) ((x) - MST_FPGA_VIRT + MST_FPGA_PHYS) diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-rpc/hardware.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-rpc/hardware.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-rpc/hardware.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-rpc/hardware.h 2005-07-05 02:00:33.000000000 +0100 @@ -14,12 +14,6 @@ #include -#ifndef __ASSEMBLY__ -#define IOMEM(x) ((void __iomem *)(x)) -#else -#define IOMEM(x) x -#endif /* __ASSEMBLY__ */ - /* * What hardware must be present */ @@ -36,15 +30,15 @@ #define EASI_SIZE 0x08000000 /* EASI I/O */ #define EASI_START 0x08000000 -#define EASI_BASE 0xe5000000 +#define EASI_BASE ASM_IOMEM(0xe5000000) #define IO_START 0x03000000 /* I/O */ #define IO_SIZE 0x01000000 -#define IO_BASE IOMEM(0xe0000000) +#define IO_BASE ASM_IOMEM(0xe0000000) #define SCREEN_START 0x02000000 /* VRAM */ #define SCREEN_END 0xdfc00000 -#define SCREEN_BASE 0xdf800000 +#define SCREEN_BASE ASM_IOMEM(0xdf800000) #define FLUSH_BASE 0xdf000000 #define UNCACHEABLE_ADDR 0xdf010000 @@ -52,12 +46,12 @@ /* * IO Addresses */ -#define VIDC_BASE (void __iomem *)0xe0400000 +#define VIDC_BASE ASM_IOMEM(0xe0400000) #define EXPMASK_BASE 0xe0360000 -#define IOMD_BASE IOMEM(0xe0200000) -#define IOC_BASE IOMEM(0xe0200000) -#define PCIO_BASE IOMEM(0xe0010000) -#define FLOPPYDMA_BASE IOMEM(0xe002a000) +#define IOMD_BASE ASM_IOMEM(0xe0200000) +#define IOC_BASE ASM_IOMEM(0xe0200000) +#define PCIO_BASE ASM_IOMEM(0xe0010000) +#define FLOPPYDMA_BASE ASM_IOMEM(0xe002a000) #define FLUSH_BASE_PHYS 0x00000000 /* ROM */ diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-s3c2410/bast-map.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-s3c2410/bast-map.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-s3c2410/bast-map.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-s3c2410/bast-map.h 2005-07-05 02:00:33.000000000 +0100 @@ -107,7 +107,7 @@ * nGCS5 - 16bit, fast */ -#define BAST_VA_MULTISPACE (0xE0000000) +#define BAST_VA_MULTISPACE ((void __iomem *)0xE0000000) #define BAST_VA_ISAIO (BAST_VA_MULTISPACE + 0x00000000) #define BAST_VA_ISAMEM (BAST_VA_MULTISPACE + 0x01000000) @@ -119,8 +119,6 @@ #define BAST_VA_DM9000 (BAST_VA_MULTISPACE + 0x02500000) #define BAST_VA_SUPERIO (BAST_VA_MULTISPACE + 0x02600000) -#define BAST_VA_MULTISPACE (0xE0000000) - #define BAST_VAM_CS2 (0x00000000) #define BAST_VAM_CS3 (0x04000000) #define BAST_VAM_CS4 (0x08000000) diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-s3c2410/vr1000-map.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-s3c2410/vr1000-map.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-s3c2410/vr1000-map.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-s3c2410/vr1000-map.h 2005-07-05 02:00:33.000000000 +0100 @@ -83,7 +83,7 @@ * nGCS5 - 16bit, fast */ -#define VR1000_VA_MULTISPACE (0xE0000000) +#define VR1000_VA_MULTISPACE ((void __iomem *)0xE0000000) #define VR1000_VA_ISAIO (VR1000_VA_MULTISPACE + 0x00000000) #define VR1000_VA_ISAMEM (VR1000_VA_MULTISPACE + 0x01000000) diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-sa1100/dma.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-sa1100/dma.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-sa1100/dma.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-sa1100/dma.h 2005-07-05 02:00:33.000000000 +0100 @@ -11,7 +11,7 @@ #define __ASM_ARCH_DMA_H #include -#include "hardware.h" +#include /* diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-sa1100/h3600.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-sa1100/h3600.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-sa1100/h3600.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-sa1100/h3600.h 2005-07-05 02:00:33.000000000 +0100 @@ -32,9 +32,9 @@ #define H3600_BANK_4_PHYS SA1100_CS4_PHYS /* Virtual memory regions corresponding to chip selects 2 & 4 (used on sleeves) */ -#define H3600_EGPIO_VIRT 0xf0000000 -#define H3600_BANK_2_VIRT 0xf1000000 -#define H3600_BANK_4_VIRT 0xf3800000 +#define H3600_EGPIO_VIRT (void __iomem *)0xf0000000 +#define H3600_BANK_2_VIRT (void __iomem *)0xf1000000 +#define H3600_BANK_4_VIRT (void __iomem *)0xf3800000 /* Machine-independent GPIO definitions diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-sa1100/hardware.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-sa1100/hardware.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-sa1100/hardware.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-sa1100/hardware.h 2005-07-05 02:00:33.000000000 +0100 @@ -16,8 +16,8 @@ /* Flushing areas */ #define FLUSH_BASE_PHYS 0xe0000000 /* SA1100 zero bank */ -#define FLUSH_BASE 0xf5000000 -#define FLUSH_BASE_MINICACHE 0xf5800000 +#define FLUSH_BASE ASM_IOMEM(0xf5000000) +#define FLUSH_BASE_MINICACHE ASM_IOMEM(0xf5800000) #define UNCACHEABLE_ADDR 0xfa050000 diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-shark/hardware.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-shark/hardware.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-shark/hardware.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-shark/hardware.h 2005-07-05 02:00:33.000000000 +0100 @@ -15,7 +15,7 @@ /* * Mapping areas */ -#define IO_BASE 0xe0000000 +#define IO_BASE ASM_IOMEM(0xe0000000) /* * RAM definitions @@ -33,8 +33,8 @@ #define ROMCARD_SIZE 0x08000000 #define ROMCARD_START 0x10000000 -#define FLUSH_BASE 0xdf000000 -#define PCIO_BASE 0xe0000000 +#define FLUSH_BASE ASM_IOMEM(0xdf000000) +#define PCIO_BASE ASM_IOMEM(0xe0000000) /* defines for the Framebuffer */ diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-versatile/hardware.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-versatile/hardware.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/arch-versatile/hardware.h 2005-06-30 12:51:28.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/arch-versatile/hardware.h 2005-07-05 02:00:33.000000000 +0100 @@ -47,6 +47,6 @@ #define pcibios_assign_all_busses() 1 /* macro to get at IO space when running virtually */ -#define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) +#define IO_ADDRESS(x) ASM_IOMEM((((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000)) #endif diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/hardware/dec21285.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/hardware/dec21285.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/hardware/dec21285.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/hardware/dec21285.h 2005-07-05 02:00:33.000000000 +0100 @@ -20,7 +20,7 @@ #include #ifndef __ASSEMBLY__ -#include +#include #define DC21285_IO(x) ((volatile unsigned long *)(ARMCSR_BASE+(x))) #else #define DC21285_IO(x) (x) diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/hardware.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/hardware.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/hardware.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/hardware.h 2005-07-05 02:00:33.000000000 +0100 @@ -13,6 +13,17 @@ #ifndef __ASM_HARDWARE_H #define __ASM_HARDWARE_H +/* we cannot use (void __iomem *) in bits passed into assembly + * files, so make a macro conditional on __ASSEMBLY__ to add + * (void __iomem *) +*/ + +#ifdef __ASSEMBLY__ +#define ASM_IOMEM(x) (x) +#else +#define ASM_IOMEM(x) ((void __iomem *)(x)) +#endif + #include #endif diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/io.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/io.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/io.h 2005-06-30 12:51:28.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/io.h 2005-07-05 02:00:33.000000000 +0100 @@ -17,7 +17,9 @@ * 12-Dec-1999 RMK More cleanups * 18-Jun-2000 RMK Removed virt_to_* and friends definitions * 05-Oct-2004 BJD Moved memory string functions to use void __iomem + * 03-Jul-2005 BJD Use instead of */ + #ifndef __ASM_ARM_IO_H #define __ASM_ARM_IO_H @@ -26,7 +28,7 @@ #include #include #include -#include +#include /* * ISA I/O bus memory addresses are 1:1 with the physical address. diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/mach/map.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/mach/map.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/mach/map.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/mach/map.h 2005-07-05 02:00:33.000000000 +0100 @@ -9,8 +9,9 @@ * * Page table mapping constructs and function prototypes */ + struct map_desc { - unsigned long virtual; + void __iomem *virtual; unsigned long physical; unsigned long length; unsigned int type; diff -urN -X ../dontdiff linux-2.6.13-rc1-git6rmk/include/asm-arm/vga.h linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/vga.h --- linux-2.6.13-rc1-git6rmk/include/asm-arm/vga.h 2005-06-17 20:48:29.000000000 +0100 +++ linux-2.6.13-rc1-git6rmk-mapdesc/include/asm-arm/vga.h 2005-07-05 02:00:33.000000000 +0100 @@ -4,7 +4,7 @@ #include #include -#define VGA_MAP_MEM(x) (PCIMEM_BASE + (x)) +#define VGA_MAP_MEM(x) ((unsigned long)PCIMEM_BASE + (x)) #define vga_readb(x) (*((volatile unsigned char *)x)) #define vga_writeb(x,y) (*((volatile unsigned char *)y) = (x))