From: Simon Glass <sjg@chromium.org>
Date: Mon, 10 Aug 2015 13:05:10 +0000 (-0600)
Subject: x86: baytrail: Tidy up interrupt and FSP init
X-Git-Tag: v2015.10-rc2~10^2~18
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=46f8efee70313a4f8fb3831dadbc0530fcbfa9b6;p=u-boot

x86: baytrail: Tidy up interrupt and FSP init

We should signal to the FSP that PCI enumeration is complete. Perform this
task in a suitable place.

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

diff --git a/arch/x86/cpu/baytrail/valleyview.c b/arch/x86/cpu/baytrail/valleyview.c
index 225ea38acc..2d5a0eb35e 100644
--- a/arch/x86/cpu/baytrail/valleyview.c
+++ b/arch/x86/cpu/baytrail/valleyview.c
@@ -9,6 +9,7 @@
 #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 },
@@ -40,6 +41,12 @@ int arch_cpu_init(void)
 
 int arch_misc_init(void)
 {
-	return pirq_init();
+	int ret;
+
+	ret = pirq_init();
+	if (ret)
+		return ret;
+
+	return fsp_init_phase_pci();
 }
 #endif