diff options
Diffstat (limited to 'arch/arm/mach-mv78xx0/pcie.c')
-rw-r--r-- | arch/arm/mach-mv78xx0/pcie.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c index 2e56e86b6d68..e2940fbbcd68 100644 --- a/arch/arm/mach-mv78xx0/pcie.c +++ b/arch/arm/mach-mv78xx0/pcie.c | |||
@@ -36,8 +36,8 @@ static struct resource pcie_mem_space; | |||
36 | 36 | ||
37 | void __init mv78xx0_pcie_id(u32 *dev, u32 *rev) | 37 | void __init mv78xx0_pcie_id(u32 *dev, u32 *rev) |
38 | { | 38 | { |
39 | *dev = orion_pcie_dev_id((void __iomem *)PCIE00_VIRT_BASE); | 39 | *dev = orion_pcie_dev_id(PCIE00_VIRT_BASE); |
40 | *rev = orion_pcie_rev((void __iomem *)PCIE00_VIRT_BASE); | 40 | *rev = orion_pcie_rev(PCIE00_VIRT_BASE); |
41 | } | 41 | } |
42 | 42 | ||
43 | static void __init mv78xx0_pcie_preinit(void) | 43 | static void __init mv78xx0_pcie_preinit(void) |
@@ -267,11 +267,11 @@ static struct hw_pci mv78xx0_pci __initdata = { | |||
267 | .map_irq = mv78xx0_pcie_map_irq, | 267 | .map_irq = mv78xx0_pcie_map_irq, |
268 | }; | 268 | }; |
269 | 269 | ||
270 | static void __init add_pcie_port(int maj, int min, unsigned long base) | 270 | static void __init add_pcie_port(int maj, int min, void __iomem *base) |
271 | { | 271 | { |
272 | printk(KERN_INFO "MV78xx0 PCIe port %d.%d: ", maj, min); | 272 | printk(KERN_INFO "MV78xx0 PCIe port %d.%d: ", maj, min); |
273 | 273 | ||
274 | if (orion_pcie_link_up((void __iomem *)base)) { | 274 | if (orion_pcie_link_up(base)) { |
275 | struct pcie_port *pp = &pcie_port[num_pcie_ports++]; | 275 | struct pcie_port *pp = &pcie_port[num_pcie_ports++]; |
276 | 276 | ||
277 | printk("link up\n"); | 277 | printk("link up\n"); |
@@ -279,7 +279,7 @@ static void __init add_pcie_port(int maj, int min, unsigned long base) | |||
279 | pp->maj = maj; | 279 | pp->maj = maj; |
280 | pp->min = min; | 280 | pp->min = min; |
281 | pp->root_bus_nr = -1; | 281 | pp->root_bus_nr = -1; |
282 | pp->base = (void __iomem *)base; | 282 | pp->base = base; |
283 | spin_lock_init(&pp->conf_lock); | 283 | spin_lock_init(&pp->conf_lock); |
284 | memset(pp->res, 0, sizeof(pp->res)); | 284 | memset(pp->res, 0, sizeof(pp->res)); |
285 | } else { | 285 | } else { |
@@ -293,7 +293,7 @@ void __init mv78xx0_pcie_init(int init_port0, int init_port1) | |||
293 | 293 | ||
294 | if (init_port0) { | 294 | if (init_port0) { |
295 | add_pcie_port(0, 0, PCIE00_VIRT_BASE); | 295 | add_pcie_port(0, 0, PCIE00_VIRT_BASE); |
296 | if (!orion_pcie_x4_mode((void __iomem *)PCIE00_VIRT_BASE)) { | 296 | if (!orion_pcie_x4_mode(PCIE00_VIRT_BASE)) { |
297 | add_pcie_port(0, 1, PCIE01_VIRT_BASE); | 297 | add_pcie_port(0, 1, PCIE01_VIRT_BASE); |
298 | add_pcie_port(0, 2, PCIE02_VIRT_BASE); | 298 | add_pcie_port(0, 2, PCIE02_VIRT_BASE); |
299 | add_pcie_port(0, 3, PCIE03_VIRT_BASE); | 299 | add_pcie_port(0, 3, PCIE03_VIRT_BASE); |