diff options
Diffstat (limited to 'arch/ppc/syslib/ppc85xx_setup.c')
-rw-r--r-- | arch/ppc/syslib/ppc85xx_setup.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/ppc/syslib/ppc85xx_setup.c b/arch/ppc/syslib/ppc85xx_setup.c index 81f1968c3269..152c3ef1312a 100644 --- a/arch/ppc/syslib/ppc85xx_setup.c +++ b/arch/ppc/syslib/ppc85xx_setup.c | |||
@@ -280,16 +280,14 @@ mpc85xx_setup_hose(void) | |||
280 | hose_a->io_space.end = MPC85XX_PCI1_UPPER_IO; | 280 | hose_a->io_space.end = MPC85XX_PCI1_UPPER_IO; |
281 | hose_a->io_base_phys = MPC85XX_PCI1_IO_BASE; | 281 | hose_a->io_base_phys = MPC85XX_PCI1_IO_BASE; |
282 | #ifdef CONFIG_85xx_PCI2 | 282 | #ifdef CONFIG_85xx_PCI2 |
283 | isa_io_base = | 283 | hose_a->io_base_virt = ioremap(MPC85XX_PCI1_IO_BASE, |
284 | (unsigned long) ioremap(MPC85XX_PCI1_IO_BASE, | ||
285 | MPC85XX_PCI1_IO_SIZE + | 284 | MPC85XX_PCI1_IO_SIZE + |
286 | MPC85XX_PCI2_IO_SIZE); | 285 | MPC85XX_PCI2_IO_SIZE); |
287 | #else | 286 | #else |
288 | isa_io_base = | 287 | hose_a->io_base_virt = ioremap(MPC85XX_PCI1_IO_BASE, |
289 | (unsigned long) ioremap(MPC85XX_PCI1_IO_BASE, | ||
290 | MPC85XX_PCI1_IO_SIZE); | 288 | MPC85XX_PCI1_IO_SIZE); |
291 | #endif | 289 | #endif |
292 | hose_a->io_base_virt = (void *) isa_io_base; | 290 | isa_io_base = (unsigned long)hose_a->io_base_virt; |
293 | 291 | ||
294 | /* setup resources */ | 292 | /* setup resources */ |
295 | pci_init_resource(&hose_a->mem_resources[0], | 293 | pci_init_resource(&hose_a->mem_resources[0], |
@@ -329,8 +327,8 @@ mpc85xx_setup_hose(void) | |||
329 | hose_b->io_space.start = MPC85XX_PCI2_LOWER_IO; | 327 | hose_b->io_space.start = MPC85XX_PCI2_LOWER_IO; |
330 | hose_b->io_space.end = MPC85XX_PCI2_UPPER_IO; | 328 | hose_b->io_space.end = MPC85XX_PCI2_UPPER_IO; |
331 | hose_b->io_base_phys = MPC85XX_PCI2_IO_BASE; | 329 | hose_b->io_base_phys = MPC85XX_PCI2_IO_BASE; |
332 | hose_b->io_base_virt = (void *) isa_io_base + MPC85XX_PCI1_IO_SIZE; | 330 | hose_b->io_base_virt = hose_a->io_base_virt + MPC85XX_PCI1_IO_SIZE; |
333 | 331 | ||
334 | /* setup resources */ | 332 | /* setup resources */ |
335 | pci_init_resource(&hose_b->mem_resources[0], | 333 | pci_init_resource(&hose_b->mem_resources[0], |
336 | MPC85XX_PCI2_LOWER_MEM, | 334 | MPC85XX_PCI2_LOWER_MEM, |