diff options
| author |   Thomas Bogendoerfer <tbogendoerfer@suse.de> | 2019-05-07 23:09:13 +0200 |
|---|---|---|
| committer |   Paul Burton <paul.burton@mips.com> | 2019-05-09 16:39:27 -0700 |
| commit | a57140e9a850582ddafdd8f115b78713baaf0d00 (patch) | |
| tree | 5bef10f17e75eb4b9168d7562856cfc9144e12c0 /arch/mips/include/asm/pci | |
| parent | MIPS: Fix Ingenic SoCs sometimes reporting wrong ISA (diff) | |
| download | linux-dev-a57140e9a850582ddafdd8f115b78713baaf0d00.tar.xz linux-dev-a57140e9a850582ddafdd8f115b78713baaf0d00.zip | |
MIPS: SGI-IP27: use generic PCI driver
Converted bridge code to a platform driver using the PCI generic driver
framework and use adding platform devices during xtalk scan. This allows
easier sharing bridge driver for other SGI platforms like IP30 (Octane) and
IP35 (Origin 3k, Fuel, Tezro).
Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
[paul.burton@mips.com:
- Leave __phys_to_dma(), __dma_to_phys() & pcibus_to_node() in
arch/mips/pci/pci-ip27.c since the motivation for moving them
disappeared when the driver stopped being moved to drivers/pci.]
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Diffstat (limited to 'arch/mips/include/asm/pci')
| -rw-r--r-- | arch/mips/include/asm/pci/bridge.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/mips/include/asm/pci/bridge.h b/arch/mips/include/asm/pci/bridge.h index 23574c27eb40..d42b27c97c23 100644 --- a/arch/mips/include/asm/pci/bridge.h +++ b/arch/mips/include/asm/pci/bridge.h @@ -801,15 +801,12 @@ struct bridge_err_cmdword { #define PCI64_ATTR_RMF_SHFT 48 struct bridge_controller { - struct pci_controller pc; - struct resource mem; - struct resource io; struct resource busn; struct bridge_regs *base; - nasid_t nasid; - unsigned int widget_id; - u64 baddr; + unsigned long baddr; + unsigned long intr_addr; unsigned int pci_int[8]; + nasid_t nasid; }; #define BRIDGE_CONTROLLER(bus) \ @@ -824,6 +821,4 @@ struct bridge_controller { extern int request_bridge_irq(struct bridge_controller *bc, int pin); -extern struct pci_ops bridge_pci_ops; - #endif /* _ASM_PCI_BRIDGE_H */ |