From 9ccfff05598a69df17040dc74e2c9194b29ee704 Mon Sep 17 00:00:00 2001
From: Huang Shijie <b32955@freescale.com>
Date: Mon, 10 Sep 2012 15:17:56 +0800
Subject: [PATCH] --- yaml --- r: 326879 b: refs/heads/master c:
 cc7887c3b1a08d3900160d93df4ddda5fa7f725b h: refs/heads/master i:   326877:
 8fd851d5ba54b245a3d5f76622300f6831e1599c   326875:
 b2f253caa51a21419364b92bb1d032cda3107276   326871:
 0b8e9bfe138b89d4b5369b329373613450790839   326863:
 437cd6422c4c3f817955a6c479e56dc399a8106b   326847:
 9f7007e6d12bedec532335c90fed87d43a698082 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/mach-imx/clk-imx6q.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a6ff4a196910..e8e9d349ed31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97a53092a148e6c70aabf13835143cc3dd4b524c
+refs/heads/master: cc7887c3b1a08d3900160d93df4ddda5fa7f725b
diff --git a/trunk/arch/arm/mach-imx/clk-imx6q.c b/trunk/arch/arm/mach-imx/clk-imx6q.c
index bbc71f57b92b..744327fc5e2b 100644
--- a/trunk/arch/arm/mach-imx/clk-imx6q.c
+++ b/trunk/arch/arm/mach-imx/clk-imx6q.c
@@ -404,6 +404,13 @@ int __init mx6q_clocks_init(void)
 	clk_register_clkdev(clk[ahb], "ahb", NULL);
 	clk_register_clkdev(clk[cko1], "cko1", NULL);
 
+	/*
+	 * The gpmi needs 100MHz frequency in the EDO/Sync mode,
+	 * We can not get the 100MHz from the pll2_pfd0_352m.
+	 * So choose pll2_pfd2_396m as enfc_sel's parent.
+	 */
+	clk_set_parent(clk[enfc_sel], clk[pll2_pfd2_396m]);
+
 	for (i = 0; i < ARRAY_SIZE(clks_init_on); i++)
 		clk_prepare_enable(clk[clks_init_on[i]]);