On Mon, Dec 19, 2011 at 11:21:41PM +0100, Marek Vasut wrote:

quoted

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()?

No, It's for converting to generic clock framwork.
You can look at Mike's generic clock patches. clk_hw_ops.enable/disable
definitely can not sleep.
On register side, there' two way to protect register:
 - use a global spin lock
 - only use spin lock wherever gate register share the same one with
   other non-gate register.

Thanks
Richard

M

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel