diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-06 18:10:10 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-06 18:10:10 -0400 |
| commit | 5617efd2c882562b716a61bc0dc0edda46b045df (patch) | |
| tree | ea55ae3b5f8b5ed7cc2b51e07c03c13cf8058147 /arch/powerpc/cpu/mpc83xx/pci.c | |
| parent | b5f9d2f3aae7b208273546965be4ea5497930882 (diff) | |
| parent | 725cf89512eba9a49d447f009e0b97fdf2ae5dd6 (diff) | |
Merge branch '2021-07-06-platform-updates'
- mpc8379erdb DM_USB, DM_PCI and DM_ETH support.
- Drop PCI support from the integrator family of boards
- Add synquacer support
- Assorted lpc32xx updates and improvements
- snapdragon (and related) fixes, Broadcom iproc update
Diffstat (limited to 'arch/powerpc/cpu/mpc83xx/pci.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc83xx/pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c index 5c289d00226..507ab3417b3 100644 --- a/arch/powerpc/cpu/mpc83xx/pci.c +++ b/arch/powerpc/cpu/mpc83xx/pci.c @@ -27,6 +27,7 @@ DECLARE_GLOBAL_DATA_PTR; static struct pci_controller pci_hose[MAX_BUSES]; static int pci_num_buses; +#if !defined(CONFIG_DM_PCI) static void pci_init_bus(int bus, struct pci_region *reg) { volatile immap_t *immr = (volatile immap_t *)CONFIG_SYS_IMMR; @@ -184,6 +185,7 @@ void mpc83xx_pcislave_unlock(int bus) hose->last_busno = pci_hose_scan(hose); } #endif +#endif /* CONFIG_DM_PCI */ #if defined(CONFIG_OF_LIBFDT) void ft_pci_setup(void *blob, struct bd_info *bd) |