path: root/arch/arm/mach-imx/clk-imx6q.c
diff options
authorOlof Johansson <olof@lixom.net>2012-09-20 20:16:27 -0700
committerOlof Johansson <olof@lixom.net>2012-09-20 20:16:27 -0700
commit84bae6c379e362aa017efd417199f51d5c2273ac (patch)
tree9001dea5bbbee5b0bafbb8b8dfd212278d861cb7 /arch/arm/mach-imx/clk-imx6q.c
parent6ded2450383c5d622d3abb4d2a4d5ce8a0e8c229 (diff)
parentcc7887c3b1a08d3900160d93df4ddda5fa7f725b (diff)
Merge tag 'imx-dt-3.7-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
From Shawn Guo: This is the second round of imx-dt patches for 3.7. It's based on and imx-dt-3.7 and imx-clk-dt-lookup which have already been pulled. * tag 'imx-dt-3.7-2' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: imx6q: use pll2_pfd2_396m as the enfc_sel's parent ARM: dts: imx6q-sabrelite: add usbotg pinctrl support ARM: dts: imx6q-sabrelite: add usbmisc device
Diffstat (limited to 'arch/arm/mach-imx/clk-imx6q.c')
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
index 32fdf73b8e5..3ec242f3341 100644
--- a/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
@@ -406,6 +406,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++)