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 a3e837d43e9cbbba4300de82f688bd8ccee0820f..2d5a0eb35e1f0d4deb5c0d70d546ffad9b4f583f 100644 (file)
--- a/arch/x86/cpu/baytrail/valleyview.c
+++ b/arch/x86/cpu/baytrail/valleyview.c
@@ -7,7 +7,9 @@
 #include <common.h>
 #include <mmc.h>
 #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 },
@@ -16,11 +18,11 @@ static struct pci_device_id mmc_supported[] = {
 
 int cpu_mmc_init(bd_t *bis)
 {
-       printf("mmc init\n");
        return pci_mmc_init("ValleyView SDHCI", mmc_supported,
                            ARRAY_SIZE(mmc_supported));
 }
 
+#ifndef CONFIG_EFI_APP
 int arch_cpu_init(void)
 {
        int ret;
@@ -36,3 +38,15 @@ int arch_cpu_init(void)
 
        return 0;
 }
+
+int arch_misc_init(void)
+{
+       int ret;
+
+       ret = pirq_init();
+       if (ret)
+               return ret;
+
+       return fsp_init_phase_pci();
+}
+#endif