diff options
| author | Benjamin Herrenschmidt | 2007-12-20 14:54:57 +1100 |
|---|---|---|
| committer | Paul Mackerras | 2007-12-20 16:18:12 +1100 |
| commit | bc0826cfb102b6f360f2ec3082fa794f5dbbdee7 (patch) | |
| tree | 05dc6ff44ea3f952bc466262ccf8894c2e093500 | |
| parent | 549beb9ba3b03345cbd8e1233825d5b197a3f9f7 (diff) | |
[POWERPC] Fixup powermac enable device hook
Powermac's use of the pcibios_enable_device_hook() got slightly
broken by the recent PCI merge in that it won't be called for
the "initial" case of assigning resources to a previously
unassigned device. This was an abuse of that hook anyway, so
instead we now use a header quirk.
While at it, we move a #ifdef CONFIG_PPC32 to enclose more code
that is only ever used on 32 bits.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/platforms/powermac/pci.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c index 1e51a8ee2b7d..96a2933a15b5 100644 --- a/arch/powerpc/platforms/powermac/pci.c +++ b/arch/powerpc/platforms/powermac/pci.c @@ -1058,6 +1058,7 @@ void __init pmac_pci_init(void) #endif } +#ifdef CONFIG_PPC32 int pmac_pci_enable_device_hook(struct pci_dev *dev) { struct device_node* node; @@ -1106,7 +1107,6 @@ int pmac_pci_enable_device_hook(struct pci_dev *dev) * bridge and we must not, for example, enable MWI or set the * cache line size on them. */ -#ifdef CONFIG_PPC32 if (updatecfg) { u16 cmd; @@ -1118,12 +1118,23 @@ int pmac_pci_enable_device_hook(struct pci_dev *dev) pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, L1_CACHE_BYTES >> 2); -#endif } return 0; } +void __devinit pmac_pci_fixup_ohci(struct pci_dev *dev) +{ + struct device_node *node = pci_device_to_OF_node(dev); + + /* We don't want to assign resources to USB controllers + * absent from the OF tree (iBook second controller) + */ + if (dev->class == PCI_CLASS_SERIAL_USB_OHCI && !node) + dev->resource[0].flags = 0; +} +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_APPLE, PCI_ANY_ID, pmac_pci_fixup_ohci); + /* We power down some devices after they have been probed. They'll * be powered back on later on */ @@ -1171,7 +1182,6 @@ void __init pmac_pcibios_after_init(void) of_node_put(nd); } -#ifdef CONFIG_PPC32 void pmac_pci_fixup_cardbus(struct pci_dev* dev) { if (!machine_is(powermac)) @@ -1259,7 +1269,7 @@ void pmac_pci_fixup_pciata(struct pci_dev* dev) } } DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, pmac_pci_fixup_pciata); -#endif +#endif /* CONFIG_PPC32 */ /* * Disable second function on K2-SATA, it's broken |