| Message ID | 20210802005446.2267075-23-sjg@chromium.org |
|---|---|
| State | Accepted |
| Commit | 63814a69864ec5b2b8e85aace86ec1270e755c09 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | pci: Drop all pre-driver model code | expand |
On Sun, Aug 01, 2021 at 06:54:35PM -0600, Simon Glass wrote: > We don't need this check anymore since when PCI is enabled, driver model > is always used. > > Drop it. > > Signed-off-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index 423b7153522..8eb05c8dd67 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -283,10 +283,6 @@ u32 get_ahb_clk(void) void arch_preboot_os(void) { -#if defined(CONFIG_PCIE_IMX) && !CONFIG_IS_ENABLED(DM_PCI) - imx_pcie_remove(); -#endif - #if defined(CONFIG_IMX_AHCI) struct udevice *dev; int rc; diff --git a/include/pci.h b/include/pci.h index ca086420ff2..2c2930e7a74 100644 --- a/include/pci.h +++ b/include/pci.h @@ -785,10 +785,6 @@ int pci_last_busno(void); extern void pci_mpc85xx_init (struct pci_controller *hose); #endif -#ifdef CONFIG_PCIE_IMX -extern void imx_pcie_remove(void); -#endif - /** * pci_write_bar32() - Write the address of a BAR including control bits *
We don't need this check anymore since when PCI is enabled, driver model is always used. Drop it. Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) arch/arm/mach-imx/cpu.c | 4 ---- include/pci.h | 4 ---- 2 files changed, 8 deletions(-)