diff options
author | Randy Vinson <rvinson@mvista.com> | 2007-07-19 13:40:53 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-07-24 11:31:49 -0400 |
commit | 8d7bc8f9d1c23fdfbf60a6554027c40d66e66d11 (patch) | |
tree | 866d85d389cf7cb7d9257104abe2e61bddaecf47 /arch/powerpc/platforms/85xx | |
parent | bca03c6bddc03bba893c86fdf735ecef418159ea (diff) |
[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>
Diffstat (limited to 'arch/powerpc/platforms/85xx')
-rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_cds.c | 8 |
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 2a41083aca3c..6a171e9abf7d 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) | |||
129 | /* There are two USB controllers. | 129 | /* There are two USB controllers. |
130 | * Identify them by functon number | 130 | * Identify them by functon number |
131 | */ | 131 | */ |
132 | if (PCI_FUNC(dev->devfn)) | 132 | if (PCI_FUNC(dev->devfn) == 3) |
133 | dev->irq = 11; | 133 | dev->irq = 11; |
134 | else | 134 | else |
135 | dev->irq = 10; | 135 | dev->irq = 10; |
@@ -300,10 +300,10 @@ static void __init mpc85xx_cds_setup_arch(void) | |||
300 | for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) { | 300 | for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) { |
301 | struct resource rsrc; | 301 | struct resource rsrc; |
302 | of_address_to_resource(np, 0, &rsrc); | 302 | of_address_to_resource(np, 0, &rsrc); |
303 | if ((rsrc.start & 0xfffff) == 0x9000) | 303 | if ((rsrc.start & 0xfffff) == 0x8000) |
304 | fsl_add_bridge(np, 0); | ||
305 | else | ||
306 | fsl_add_bridge(np, 1); | 304 | fsl_add_bridge(np, 1); |
305 | else | ||
306 | fsl_add_bridge(np, 0); | ||
307 | } | 307 | } |
308 | ppc_md.pci_irq_fixup = mpc85xx_cds_pci_irq_fixup; | 308 | ppc_md.pci_irq_fixup = mpc85xx_cds_pci_irq_fixup; |
309 | ppc_md.pci_exclude_device = mpc85xx_exclude_device; | 309 | ppc_md.pci_exclude_device = mpc85xx_exclude_device; |