x86: quark: Fix boot breakage

With driver model timer conversion, quark based board does not boot
any more as mdelay() is called during quark_pcie_early_init() which
is before driver model gets initialized. Fix this breakage.

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

diff --git a/arch/x86/cpu/quark/quark.c b/arch/x86/cpu/quark/quark.c
index 37ce3940b085e4685864f1dd52d6e13efb2145dc..72c681dceabaece9c81d1983199d31cdcf9fca1d 100644 (file)
--- a/arch/x86/cpu/quark/quark.c
+++ b/arch/x86/cpu/quark/quark.c
@@ -252,17 +252,6 @@ int arch_cpu_init(void)
         */
        quark_setup_bars();
 
-       /*
-        * Initialize PCIe controller
-        *
-        * Quark SoC holds the PCIe controller in reset following a power on.
-        * U-Boot needs to release the PCIe controller from reset. The PCIe
-        * controller (D23:F0/F1) will not be visible in PCI configuration
-        * space and any access to its PCI configuration registers will cause
-        * system hang while it is held in reset.
-        */
-       quark_pcie_early_init();
-
        /* Initialize USB2 PHY */
        quark_usb_early_init();
 
@@ -277,6 +266,22 @@ int arch_cpu_init(void)
        return 0;
 }
 
+int arch_cpu_init_dm(void)
+{
+       /*
+        * Initialize PCIe controller
+        *
+        * Quark SoC holds the PCIe controller in reset following a power on.
+        * U-Boot needs to release the PCIe controller from reset. The PCIe
+        * controller (D23:F0/F1) will not be visible in PCI configuration
+        * space and any access to its PCI configuration registers will cause
+        * system hang while it is held in reset.
+        */
+       quark_pcie_early_init();
+
+       return 0;
+}
+
 int print_cpuinfo(void)
 {
        post_code(POST_CPU_INFO);