diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-09-11 14:27:18 +0200 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2012-09-21 18:03:23 +0000 |
| commit | c3c5a2815d0b7ebde157556685a0ef8ffa34b98c (patch) | |
| tree | d60d825a2ea57e3336f7dfce05eb2f30676982b9 /arch/arm/mach-dove/pcie.c | |
| parent | 2332656aec7ae88248cbd9aa6b35c857bb449c94 (diff) | |
arm: mach-dove: use IOMEM() for base address definitions
We now define all virtual base address constants using IOMEM() so that
those are naturally typed as void __iomem pointers, and we do the
necessary adjustements in the mach-dove code.
Note that we introduce a few temporary additional "unsigned long"
casts when calling into plat-orion functions. Those are removed by
followup patches converting plat-orion functions to void __iomem
pointers as well.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-dove/pcie.c')
| -rw-r--r-- | arch/arm/mach-dove/pcie.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-dove/pcie.c b/arch/arm/mach-dove/pcie.c index 47921b0cdc6..b3724414fd1 100644 --- a/arch/arm/mach-dove/pcie.c +++ b/arch/arm/mach-dove/pcie.c @@ -197,18 +197,18 @@ static struct hw_pci dove_pci __initdata = { .map_irq = dove_pcie_map_irq, }; -static void __init add_pcie_port(int index, unsigned long base) +static void __init add_pcie_port(int index, void __iomem *base) { printk(KERN_INFO "Dove PCIe port %d: ", index); - if (orion_pcie_link_up((void __iomem *)base)) { + if (orion_pcie_link_up(base)) { struct pcie_port *pp = &pcie_port[num_pcie_ports++]; printk(KERN_INFO "link up\n"); pp->index = index; pp->root_bus_nr = -1; - pp->base = (void __iomem *)base; + pp->base = base; spin_lock_init(&pp->conf_lock); memset(pp->res, 0, sizeof(pp->res)); } else { |