summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2015-08-20 06:40:21 -0700
committerSimon Glass <sjg@chromium.org>2015-08-26 07:54:12 -0700
commit090290f97b90eff1fe190d89ef0d976729cda13e (patch)
tree96d6749448a2119f9fe67f20002cd9b8e53f2a22 /arch/x86
parent48aa6c261492235c1e48c17a6604b71e032485e8 (diff)
downloadtalos-obmc-uboot-090290f97b90eff1fe190d89ef0d976729cda13e.tar.gz
talos-obmc-uboot-090290f97b90eff1fe190d89ef0d976729cda13e.zip
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 <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/cpu/queensbay/tnc.c4
1 files 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();
}
OpenPOWER on IntegriCloud