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 225ea38acc41d92c140146cd9620b32737c02f94..2d5a0eb35e1f0d4deb5c0d70d546ffad9b4f583f 100644 (file)
--- 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