From 41071e7622ffa4e49541b501d92a9c3901302d44 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Thu, 20 Aug 2015 06:40:21 -0700 Subject: [PATCH] x86: queensbay: Move unprotect_spi_flash() to arch_misc_init() 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 Acked-by: Simon Glass --- arch/x86/cpu/queensbay/tnc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/cpu/queensbay/tnc.c b/arch/x86/cpu/queensbay/tnc.c index c4656422e1..9682cfff26 100644 --- a/arch/x86/cpu/queensbay/tnc.c +++ b/arch/x86/cpu/queensbay/tnc.c @@ -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(); } -- 2.39.2