diff options
| author | Daniel Axtens | 2015-03-31 07:00:53 +0200 |
|---|---|---|
| committer | Michael Ellerman | 2015-04-11 12:49:17 +0200 |
| commit | 19124d6deed32c5c7096f1892dd9f3882cef4605 (patch) | |
| tree | b6b9881c151a4e1a0e65d73770095ef73118d4c9 /arch/powerpc | |
| parent | powerpc/pasemi: Move controller ops from ppc_md to controller_ops (diff) | |
| download | kernel-qcow2-linux-19124d6deed32c5c7096f1892dd9f3882cef4605.tar.gz kernel-qcow2-linux-19124d6deed32c5c7096f1892dd9f3882cef4605.tar.xz kernel-qcow2-linux-19124d6deed32c5c7096f1892dd9f3882cef4605.zip | |
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: Daniel Axtens <dja@axtens.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/platforms/maple/maple.h | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/maple/pci.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/platforms/maple/setup.c | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/maple/maple.h b/arch/powerpc/platforms/maple/maple.h index c6911ddc479f..eecfa182b06e 100644 --- a/arch/powerpc/platforms/maple/maple.h +++ b/arch/powerpc/platforms/maple/maple.h @@ -10,3 +10,5 @@ extern void maple_calibrate_decr(void); extern void maple_pci_init(void); 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 struct pci_controller_ops maple_pci_controller_ops; diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c index d3a13067ec42..a923230e575b 100644 --- a/arch/powerpc/platforms/maple/pci.c +++ b/arch/powerpc/platforms/maple/pci.c @@ -510,6 +510,7 @@ static int __init maple_add_bridge(struct device_node *dev) return -ENOMEM; hose->first_busno = bus_range ? bus_range[0] : 0; hose->last_busno = bus_range ? bus_range[1] : 0xff; + hose->controller_ops = maple_pci_controller_ops; disp_name = NULL; if (of_device_is_compatible(dev, "u3-agp")) { @@ -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, quirk_ipr_msi); + +struct pci_controller_ops maple_pci_controller_ops = { +}; diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c index 3bf2e0359d5e..a837188544c8 100644 --- a/arch/powerpc/platforms/maple/setup.c +++ b/arch/powerpc/platforms/maple/setup.c @@ -203,7 +203,7 @@ static void __init maple_init_early(void) { DBG(" -> maple_init_early\n"); - iommu_init_early_dart(NULL); + iommu_init_early_dart(&maple_pci_controller_ops); DBG(" <- maple_init_early\n"); } |