summaryrefslogtreecommitdiffstats
path: root/board/compulab/cm_fx6/spl.c
diff options
context:
space:
mode:
authorNikita Kiryanov <nikita@compulab.co.il>2014-08-20 15:09:01 +0300
committerStefano Babic <sbabic@denx.de>2014-09-09 15:37:07 +0200
commita6b0652bb5040351eeb1a2580270bd3988cb0a59 (patch)
tree61aba4c95ddb25b651ba9c8ffe64a0c6285b88e5 /board/compulab/cm_fx6/spl.c
parente32028a70ba2be17732b21f98b242d9fe3d977cf (diff)
downloadblackbird-obmc-uboot-a6b0652bb5040351eeb1a2580270bd3988cb0a59.tar.gz
blackbird-obmc-uboot-a6b0652bb5040351eeb1a2580270bd3988cb0a59.zip
arm: mx6: cm_fx6: add nand support
Add NAND support for Compulab CM-FX6 CoM. Cc: Igor Grinberg <grinberg@compulab.co.il> Cc: Stefano Babic <sbabic@denx.de> Cc: Tom Rini <trini@ti.com> Acked-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Diffstat (limited to 'board/compulab/cm_fx6/spl.c')
-rw-r--r--board/compulab/cm_fx6/spl.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/board/compulab/cm_fx6/spl.c b/board/compulab/cm_fx6/spl.c
index a3abc7b3f3..3948ba23ae 100644
--- a/board/compulab/cm_fx6/spl.c
+++ b/board/compulab/cm_fx6/spl.c
@@ -15,6 +15,7 @@
#include <asm/arch/mx6-ddr.h>
#include <asm/arch/clock.h>
#include <asm/arch/sys_proto.h>
+#include <asm/arch/crm_regs.h>
#include <asm/imx-common/iomux-v3.h>
#include <fsl_esdhc.h>
#include "common.h"
@@ -309,7 +310,17 @@ static void cm_fx6_setup_ecspi(void) { }
void board_init_f(ulong dummy)
{
+ struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+
gd = &gdata;
+ /*
+ * We don't use DMA in SPL, but we do need it in U-Boot. U-Boot
+ * initializes DMA very early (before all board code), so the only
+ * opportunity we have to initialize APBHDMA clocks is in SPL.
+ */
+ setbits_le32(&mxc_ccm->CCGR0, MXC_CCM_CCGR0_APBHDMA_MASK);
+ enable_usdhc_clk(1, 2);
+
arch_cpu_init();
timer_init();
cm_fx6_setup_ecspi();
OpenPOWER on IntegriCloud