Thread (18 messages) 18 messages, 4 authors, 2011-12-20
STALE5301d

Re: [PATCH V3 10/14] ARM: mxs: add clk_prepare/clk_unprepare

From: Marek Vasut <hidden>
Date: 2011-12-19 22:21:41
Also in: linux-arm-kernel, linux-i2c, linux-mmc, netdev

quoted hunk ↗ jump to hunk
Signed-off-by: Richard Zhao <redacted>
---
 arch/arm/mach-mxs/system.c |    2 +-
 arch/arm/mach-mxs/timer.c  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-mxs/system.c b/arch/arm/mach-mxs/system.c
index 20ec3bd..9760a12 100644
--- a/arch/arm/mach-mxs/system.c
+++ b/arch/arm/mach-mxs/system.c
@@ -66,7 +66,7 @@ static int __init mxs_arch_reset_init(void)

 	clk = clk_get_sys("rtc", NULL);
 	if (!IS_ERR(clk))
-		clk_enable(clk);
+		clk_prepare_enable(clk);

 	return 0;
 }
diff --git a/arch/arm/mach-mxs/timer.c b/arch/arm/mach-mxs/timer.c
index cace0d2..564a632 100644
--- a/arch/arm/mach-mxs/timer.c
+++ b/arch/arm/mach-mxs/timer.c
@@ -245,7 +245,7 @@ static int __init mxs_clocksource_init(struct clk
*timer_clk)

 void __init mxs_timer_init(struct clk *timer_clk, int irq)
 {
-	clk_enable(timer_clk);
+	clk_prepare_enable(timer_clk);

 	/*
 	 * Initialize timers to a known state
Hi Richard,

I just came across this, will this also help solve the mxs problem with mutex 
lock begin done in atomic context in clk_enable/disable()?

M
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help