From ebacc78e3e5c77e98216ebfe45012f7e632c2786 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 1 Aug 2021 18:54:36 -0600 Subject: [PATCH] pci: arm: mvebu: Drop DM_PCI check from arch_early_init_r We don't need this check anymore since when PCI is enabled, driver model is always used. Use CONFIG_PCI instead. Signed-off-by: Simon Glass [trini: Correct macro usage) Signed-off-by: Tom Rini --- arch/arm/mach-mvebu/arm64-common.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c index fa687d8..5357aa5 100644 --- a/arch/arm/mach-mvebu/arm64-common.c +++ b/arch/arm/mach-mvebu/arm64-common.c @@ -104,10 +104,9 @@ int arch_early_init_r(void) /* Cause the SATA device to do its early init */ uclass_first_device(UCLASS_AHCI, &dev); -#ifdef CONFIG_DM_PCI /* Trigger PCIe devices detection */ - pci_init(); -#endif + if (IS_ENABLED(CONFIG_PCI)) + pci_init(); return 0; } -- 2.7.4