---

yaml --- r: 355165 b: refs/heads/master c: 4b526ca h: refs/heads/master i: 355163: 330754b v: v3
git-mirror · Feb 5, 2013 · 42de45e · 42de45e
1 parent 1a19efa
commit 42de45e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a3ef226762a89ed6d9281e9dd5c6cab6e65b905
+refs/heads/master: 4b526ca5f627188425184a22ed46c91baa602d43
diff --git a/trunk/arch/arm/mach-imx/clk-imx25.c b/trunk/arch/arm/mach-imx/clk-imx25.c
@@ -224,6 +224,9 @@ static int __init __mx25_clocks_init(unsigned long osc_rate)
 
 	clk_prepare_enable(clk[emi_ahb]);
 
+	/* Clock source for gpt must be derived from AHB */
+	clk_set_parent(clk[per5_sel], clk[ahb]);
+
 	clk_register_clkdev(clk[ipg], "ipg", "imx-gpt.0");
 	clk_register_clkdev(clk[gpt_ipg_per], "per", "imx-gpt.0");