summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Vinson <rvinson@mvista.com>2007-07-19 10:40:53 -0700
committerKumar Gala <galak@kernel.crashing.org>2007-07-24 10:31:49 -0500
commit8d7bc8f9d1c23fdfbf60a6554027c40d66e66d11 (patch)
tree866d85d389cf7cb7d9257104abe2e61bddaecf47
parentbca03c6bddc03bba893c86fdf735ecef418159ea (diff)
downloadop-kernel-dev-8d7bc8f9d1c23fdfbf60a6554027c40d66e66d11.zip
op-kernel-dev-8d7bc8f9d1c23fdfbf60a6554027c40d66e66d11.tar.gz
[POWERPC] 85xxCDS: Misc 8548 PCI Corrections.
Setting the host bridge @8000 as primary. Also fixing a bug in setting the USB interrupt numbers. Signed-off-by: Randy Vinson <rvinson@mvista.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r--arch/powerpc/platforms/85xx/mpc85xx_cds.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index 2a41083..6a171e9 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -129,7 +129,7 @@ static void __init mpc85xx_cds_pci_irq_fixup(struct pci_dev *dev)
/* There are two USB controllers.
* Identify them by functon number
*/
- if (PCI_FUNC(dev->devfn))
+ if (PCI_FUNC(dev->devfn) == 3)
dev->irq = 11;
else
dev->irq = 10;
@@ -300,10 +300,10 @@ static void __init mpc85xx_cds_setup_arch(void)
for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) {
struct resource rsrc;
of_address_to_resource(np, 0, &rsrc);
- if ((rsrc.start & 0xfffff) == 0x9000)
- fsl_add_bridge(np, 0);
- else
+ if ((rsrc.start & 0xfffff) == 0x8000)
fsl_add_bridge(np, 1);
+ else
+ fsl_add_bridge(np, 0);
}
ppc_md.pci_irq_fixup = mpc85xx_cds_pci_irq_fixup;
ppc_md.pci_exclude_device = mpc85xx_exclude_device;
OpenPOWER on IntegriCloud