summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/armv7/socfpga/misc.c
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-11-11 16:59:44 -0500
committerTom Rini <trini@ti.com>2014-11-11 16:59:44 -0500
commitc88eaea0a0a809884388c3a5727d960bac0b0ced (patch)
tree931ee327363b8cd83c3867d972c33972527639d8 /arch/arm/cpu/armv7/socfpga/misc.c
parent6841deb6209ee420b7bcb6e320a8a06fd57658df (diff)
parenta877bec3ecd7961211a59b2c130e055e0f771976 (diff)
downloadblackbird-obmc-uboot-c88eaea0a0a809884388c3a5727d960bac0b0ced.tar.gz
blackbird-obmc-uboot-c88eaea0a0a809884388c3a5727d960bac0b0ced.zip
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'arch/arm/cpu/armv7/socfpga/misc.c')
-rw-r--r--arch/arm/cpu/armv7/socfpga/misc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/socfpga/misc.c b/arch/arm/cpu/armv7/socfpga/misc.c
index 8c3e5f7cd4..73cffd3a8d 100644
--- a/arch/arm/cpu/armv7/socfpga/misc.c
+++ b/arch/arm/cpu/armv7/socfpga/misc.c
@@ -202,6 +202,12 @@ int arch_early_init_r(void)
/* Add device descriptor to FPGA device table */
socfpga_fpga_add();
+
+#ifdef CONFIG_DESIGNWARE_SPI
+ /* Get Designware SPI controller out of reset */
+ socfpga_spim_enable();
+#endif
+
return 0;
}
OpenPOWER on IntegriCloud