From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Tue, 26 Apr 2016 13:29:48 +0000 (+0200)
Subject: mx6: clock: use setup_gpmi_io_clk() to change nfc clk divider for CONFIG_NAND_MXS
X-Git-Tag: KARO-TX6-2016-04-26~2
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=758ad3417ddcd5e94d08d6f4210ea6c5cdd9f940

mx6: clock: use setup_gpmi_io_clk() to change nfc clk divider for CONFIG_NAND_MXS
---

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);
 	}