---

yaml --- r: 326879 b: refs/heads/master c: cc7887c h: refs/heads/master i: 326877: 8fd851d 326875: b2f253c 326871: 0b8e9bf 326863: 437cd64 326847: 9f7007e v: v3
git-mirror · Sep 19, 2012 · 9ccfff0 · 9ccfff0
1 parent 8198751
commit 9ccfff0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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]]);