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)
committerLothar Waßmann <LW@KARO-electronics.de>
Thu, 10 Sep 2015 09:29:46 +0000 (11:29 +0200)
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 c465642..9682cff 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();
 }