From: Bin Meng <bmeng.cn@gmail.com>
Date: Thu, 20 Aug 2015 13:40:22 +0000 (-0700)
Subject: x86: baytrail: Remove the fsp_init_phase_pci() call
X-Git-Tag: v2025.01-rc5-pxa1908~11935^2~24
X-Git-Url: http://git.dujemihanovic.xyz/img/static/html/index.html?a=commitdiff_plain;h=fa6af7b4e00cd06138375999d04dd2cd6a515664;p=u-boot.git

x86: baytrail: Remove the fsp_init_phase_pci() call

It turns out that calling fsp_init_phase_pci() in arch_misc_init()
is subject to break pci device drivers as with driver model, when
the bus enumeration happens is not deterministic.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
---

diff --git a/arch/x86/cpu/baytrail/valleyview.c b/arch/x86/cpu/baytrail/valleyview.c
index 6c3dfe894f..4baaae62ff 100644
--- a/arch/x86/cpu/baytrail/valleyview.c
+++ b/arch/x86/cpu/baytrail/valleyview.c
@@ -9,7 +9,6 @@
 #include <pci_ids.h>
 #include <asm/irq.h>
 #include <asm/post.h>
-#include <asm/fsp/fsp_support.h>
 
 static struct pci_device_id mmc_supported[] = {
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SDIO },
@@ -41,14 +40,9 @@ int arch_cpu_init(void)
 
 int arch_misc_init(void)
 {
-	int ret;
-
 	if (!ll_boot_init())
 		return 0;
-	ret = pirq_init();
-	if (ret)
-		return ret;
 
-	return fsp_init_phase_pci();
+	return pirq_init();
 }
 #endif