x86: queensbay: Move unprotect_spi_flash() to arch_misc_init()
authorBin Meng <bmeng.cn@gmail.com>
Thu, 20 Aug 2015 13:40:21 +0000 (06:40 -0700)
committerSimon Glass <sjg@chromium.org>
Wed, 26 Aug 2015 14:54:12 +0000 (07:54 -0700)
With dm pci conversion, pci config read/write in unprotect_spi_flash()
silently fails as at that time dm pci is not ready and bus enumeration
is not done yet. Actually we don't need to do this in that early phase,
hence we delay this call to arch_misc_init().

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
arch/x86/cpu/queensbay/tnc.c

index c4656422e15ec0c51826a4541d853208edef6b38..9682cfff26b96ac7ba0d84d10eb09d660cc280e3 100644 (file)
@@ -36,8 +36,6 @@ int arch_cpu_init(void)
        if (ret)
                return ret;
 
-       unprotect_spi_flash();
-
        return 0;
 }
 
@@ -80,5 +78,7 @@ void cpu_irq_init(void)
 
 int arch_misc_init(void)
 {
+       unprotect_spi_flash();
+
        return pirq_init();
 }