Skip to content

Commit

Permalink
powerpc/maple: Move controller ops from ppc_md to controller_ops
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Daniel Axtens authored and Michael Ellerman committed Apr 11, 2015
1 parent d28a0d9 commit 19124d6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
2 changes: 2 additions & 0 deletions arch/powerpc/platforms/maple/maple.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
4 changes: 4 additions & 0 deletions arch/powerpc/platforms/maple/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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")) {
Expand Down Expand Up @@ -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 = {
};
2 changes: 1 addition & 1 deletion arch/powerpc/platforms/maple/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down

0 comments on commit 19124d6

Please sign in to comment.