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 git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
plat-mxc
/
time.c
diff --git
a/arch/arm/plat-mxc/time.c
b/arch/arm/plat-mxc/time.c
index 1c96cdb4c35e9036ff78e97a084a1423a720e1ca..7daf7c9a413bf62eb9a7ad86f659a0eadf016d44 100644
(file)
--- a/
arch/arm/plat-mxc/time.c
+++ b/
arch/arm/plat-mxc/time.c
@@
-283,7
+283,7
@@
void __init mxc_timer_init(struct clk *timer_clk, void __iomem *base, int irq)
{
uint32_t tctl_val;
- clk_enable(timer_clk);
+ clk_
prepare_
enable(timer_clk);
timer_base = base;