From: Simon Glass <sjg@chromium.org>
Date: Mon, 2 Aug 2021 00:54:36 +0000 (-0600)
Subject: pci: arm: mvebu: Drop DM_PCI check from arch_early_init_r
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=ebacc78e3e5c77e98216ebfe45012f7e632c2786;p=u-boot.git

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 <sjg@chromium.org>
[trini: Correct macro usage)
Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c
index fa687d8abb..5357aa554d 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;
 }