ARM: at91: rm9200 fix time support
PATCH 1/1 ARM: at91: rm9200 fix time support
since commit 838a2ae80a6ab52139fb1bf0a93ea8c5eff94488
Author: Shawn Guo <[email protected]> Date: Sat Jan 12 11:50:05 2013 +0000
ARM: use clockevents_config_and_register() where possible
The timer is wrongly configured and result in since crash so revert it on rm9200 timer
---
Hi Greg,
if possible apply it to v3.8 and v3.9 stable
I'll apply it for mainline
Best Regards,
J.
arch/arm/mach-at91/at91rm9200_time.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
arch/arm/mach-at91/at91rm9200_time.c +5 -2
@@ -174,6 +174,7 @@ clkevt32k_next_event(unsigned long delta, struct clock_event_device *dev)static struct clock_event_device clkevt = { .name ="at91_tick" , .features =CLOCK_EVT_FEAT_PERIODIC |CLOCK_EVT_FEAT_ONESHOT , + .shift =32 , .rating =150 , .set_next_event = clkevt32k_next_event, .set_mode = clkevt32k_mode,
@@ -264,9 +265,11 @@ void __init at91rm9200_timer_init(void)at91_st_write (AT91_ST_RTMR ,1 );/* Setup timer clockevent, with minimum of two ticks (important!!) */ + clkevt.mult =div_sc (AT91_SLOW_CLOCK ,NSEC_PER_SEC , clkevt.shift); + clkevt.max_delta_ns =clockevent_delta2ns (AT91_ST_ALMV , &clkevt); + clkevt.min_delta_ns =clockevent_delta2ns (2 , &clkevt) +1 ; clkevt.cpumask =cpumask_of (0 ); -clockevents_config_and_register (&clkevt,AT91_SLOW_CLOCK , -2 ,AT91_ST_ALMV ); +clockevents_register_device (&clkevt);/* register clocksource */ clocksource_register_hz (&clk32k,AT91_SLOW_CLOCK );
Signature · 1 line
1.7.10.4
PATCH 1/1 ARM: at91: rm9200 fix time support
Quoted 12 lines · Jean-Christophe PLAGNIOL-VILLARD
since commit
838a2ae80a6ab52139fb1bf0a93ea8c5eff94488Author: Shawn Guo <[email protected]> Date: Sat Jan 12 11:50:05 2013 +0000ARM: use
clockevents_config_and_register()where possibleThe timer is wrongly configured and result in since crash so revert it on rm9200 timer
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>Cc Shawn Guo <[email protected]>Cc Nicolas Ferre <[email protected]>
Quoted 6 lines
---
Hi Greg,if possible apply it to v3.8 and v3.9 stable
I'll apply it for mainline
<formletter>
This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read Documentation/stable_kernel_rules.txt for how to do this properly.
</formletter>
PATCH 1/1 ARM: at91: rm9200 fix time support
In reply to Jean-Christophe PLAGNIOL-VILLARDOn 05/05/2013 22:20, Jean-Christophe PLAGNIOL-VILLARD :
Quoted 8 lines
since commit
838a2ae80a6ab52139fb1bf0a93ea8c5eff94488Author: Shawn Guo <[email protected]> Date: Sat Jan 12 11:50:05 2013 +0000ARM: use
clockevents_config_and_register()where possibleThe timer is wrongly configured and result in since crash so revert it on rm9200 timer
What is strange is that this function is widely used now. So before reverting its use for rm9200, we may have to find why it is not working properly...
Best regards,
Quoted 42 lines
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>Cc Shawn Guo <[email protected]>Cc Nicolas Ferre <[email protected]>---
Hi Greg,if possible apply it to v3.8 and v3.9 stable
I'll apply it for mainline
Best Regards,
J.arch/arm/mach-at91/at91rm9200_time.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)arch/arm/mach-at91/at91rm9200_time.c +5
-2@@ -174,6 +174,7 @@ clkevt32k_next_event(unsigned long delta, struct clock_event_device *dev)static struct clock_event_device clkevt = { .name ="at91_tick" , .features =CLOCK_EVT_FEAT_PERIODIC |CLOCK_EVT_FEAT_ONESHOT , + .shift =32 , .rating =150 , .set_next_event = clkevt32k_next_event, .set_mode = clkevt32k_mode,@@ -264,9 +265,11 @@ void __init at91rm9200_timer_init(void)at91_st_write (AT91_ST_RTMR ,1 );/* Setup timer clockevent, with minimum of two ticks (important!!) */ + clkevt.mult =div_sc (AT91_SLOW_CLOCK ,NSEC_PER_SEC , clkevt.shift); + clkevt.max_delta_ns =clockevent_delta2ns (AT91_ST_ALMV , &clkevt); + clkevt.min_delta_ns =clockevent_delta2ns (2 , &clkevt) +1 ; clkevt.cpumask =cpumask_of (0 ); -clockevents_config_and_register (&clkevt,AT91_SLOW_CLOCK , -2 ,AT91_ST_ALMV ); +clockevents_register_device (&clkevt);/* register clocksource */ clocksource_register_hz (&clk32k,AT91_SLOW_CLOCK );
Signature · 1 line
Nicolas Ferre