X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=arch%2Farm%2Fcpu%2Farmv7%2Fmx6%2Fclock.c;h=c3c9c5e6512ba13ebacd96181056e915db9e14da;hp=9e76adc8089c2e68a86cb7966dfbf7e14fbc3a19;hb=758ad3417ddcd5e94d08d6f4210ea6c5cdd9f940;hpb=8c0c7ed7ace877d74e6e7e78fcc87c3e59e9ee17

diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c
index 9e76adc808..c3c9c5e651 100644
--- a/arch/arm/cpu/armv7/mx6/clock.c
+++ b/arch/arm/cpu/armv7/mx6/clock.c
@@ -698,8 +698,12 @@ static int set_nfc_clk(u32 ref, u32 freq_khz)
 	if ((cs2cdr & CS2CDR_ENFC_MASK) != nfc_val) {
 		debug("changing cs2cdr from %08x to %08x\n", cs2cdr,
 			(cs2cdr & ~CS2CDR_ENFC_MASK) | nfc_val);
+#ifdef CONFIG_NAND_MXS
+		setup_gpmi_io_clk(nfc_val);
+#else
 		__raw_writel((cs2cdr & ~CS2CDR_ENFC_MASK) | nfc_val,
 			&imx_ccm->cs2cdr);
+#endif
 	} else {
 		debug("Leaving cs2cdr unchanged [%08x]\n", cs2cdr);
 	}