projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'spi/topic/blackfin-v3' into spi-next
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-imx
/
clk-imx25.c
diff --git
a/arch/arm/mach-imx/clk-imx25.c
b/arch/arm/mach-imx/clk-imx25.c
index 2c570cdaae7b1f9152f6cb1e0dd122882cfac028..69858c78f40d07ff5a4ef7a2ae724b09813a19f5 100644
(file)
--- a/
arch/arm/mach-imx/clk-imx25.c
+++ b/
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");