Commit 19124d6d authored by Daniel Axtens's avatar Daniel Axtens Committed by Michael Ellerman

powerpc/maple: Move controller ops from ppc_md to controller_ops

This moves the Maple platform to use the pci_controller_ops
structure rather than ppc_md for PCI controller operations.
Signed-off-by: default avatarDaniel Axtens <dja@axtens.net>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent d28a0d94
...@@ -10,3 +10,5 @@ extern void maple_calibrate_decr(void); ...@@ -10,3 +10,5 @@ extern void maple_calibrate_decr(void);
extern void maple_pci_init(void); extern void maple_pci_init(void);
extern void maple_pci_irq_fixup(struct pci_dev *dev); extern void maple_pci_irq_fixup(struct pci_dev *dev);
extern int maple_pci_get_legacy_ide_irq(struct pci_dev *dev, int channel); extern int maple_pci_get_legacy_ide_irq(struct pci_dev *dev, int channel);
extern struct pci_controller_ops maple_pci_controller_ops;
...@@ -510,6 +510,7 @@ static int __init maple_add_bridge(struct device_node *dev) ...@@ -510,6 +510,7 @@ static int __init maple_add_bridge(struct device_node *dev)
return -ENOMEM; return -ENOMEM;
hose->first_busno = bus_range ? bus_range[0] : 0; hose->first_busno = bus_range ? bus_range[0] : 0;
hose->last_busno = bus_range ? bus_range[1] : 0xff; hose->last_busno = bus_range ? bus_range[1] : 0xff;
hose->controller_ops = maple_pci_controller_ops;
disp_name = NULL; disp_name = NULL;
if (of_device_is_compatible(dev, "u3-agp")) { if (of_device_is_compatible(dev, "u3-agp")) {
...@@ -660,3 +661,6 @@ static void quirk_ipr_msi(struct pci_dev *dev) ...@@ -660,3 +661,6 @@ static void quirk_ipr_msi(struct pci_dev *dev)
} }
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN, DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN,
quirk_ipr_msi); quirk_ipr_msi);
struct pci_controller_ops maple_pci_controller_ops = {
};
...@@ -203,7 +203,7 @@ static void __init maple_init_early(void) ...@@ -203,7 +203,7 @@ static void __init maple_init_early(void)
{ {
DBG(" -> maple_init_early\n"); DBG(" -> maple_init_early\n");
iommu_init_early_dart(NULL); iommu_init_early_dart(&maple_pci_controller_ops);
DBG(" <- maple_init_early\n"); DBG(" <- maple_init_early\n");
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment