x86: baytrail: Tidy up interrupt and FSP init

[oweals/u-boot.git] / arch / x86 / cpu / baytrail / valleyview.c

diff --git a/arch/x86/cpu/baytrail/valleyview.c b/arch/x86/cpu/baytrail/valleyview.c
index d8d2b8d418bee24b255d9fb910d96dffa59f83f2..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 },
@@ -21,6 +22,7 @@ int cpu_mmc_init(bd_t *bis)
                            ARRAY_SIZE(mmc_supported));
 }
 
+#ifndef CONFIG_EFI_APP
 int arch_cpu_init(void)
 {
        int ret;
@@ -39,7 +41,12 @@ int arch_cpu_init(void)
 
 int arch_misc_init(void)
 {
-       pirq_init();
+       int ret;
 
-       return 0;
+       ret = pirq_init();
+       if (ret)
+               return ret;
+
+       return fsp_init_phase_pci();
 }
+#endif