From: nicolas.ferre@atmel•com (Nicolas Ferre)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 1/1] ARM: at91: rm9200 fix time support
Date: Wed, 15 May 2013 12:36:02 +0200 [thread overview]
Message-ID: <51936512.9020400@atmel.com> (raw)
In-Reply-To: <1368612753-32565-1-git-send-email-plagnioj@jcrosoft.com>
On 15/05/2013 12:12, Jean-Christophe PLAGNIOL-VILLARD :
> since commit 838a2ae80a6ab52139fb1bf0a93ea8c5eff94488
> Author: Shawn Guo <shawn.guo@linaro•org>
> 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 a nice crash
> so revert it on rm9200 timer
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft•com>
> Cc: stable <stable@vger•kernel.org> # 3.8+
> Cc: Shawn Guo <shawn.guo@linaro•org>
> Cc: Nicolas Ferre <nicolas.ferre@atmel•com>
Ok, even if I said that it would have been better to understand the root
cause of this, it is also true that we have to move forward in the
meantime...
So, yes, I take it for at91-3.10-fixes:
Acked-by: Nicolas Ferre <nicolas.ferre@atmel•com>
Thanks,
> ---
> arch/arm/mach-at91/at91rm9200_time.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-at91/at91rm9200_time.c b/arch/arm/mach-at91/at91rm9200_time.c
> index 2acdff4..180b302 100644
> --- a/arch/arm/mach-at91/at91rm9200_time.c
> +++ b/arch/arm/mach-at91/at91rm9200_time.c
> @@ -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);
>
--
Nicolas Ferre
next prev parent reply other threads:[~2013-05-15 10:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-15 10:12 [PATCH 1/1] ARM: at91: rm9200 fix time support Jean-Christophe PLAGNIOL-VILLARD
2013-05-15 10:36 ` Nicolas Ferre [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-05-05 20:20 Jean-Christophe PLAGNIOL-VILLARD
2013-05-05 21:26 ` Greg KH
2013-05-15 10:08 ` Nicolas Ferre
2013-05-05 20:13 Jean-Christophe PLAGNIOL-VILLARD
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51936512.9020400@atmel.com \
--to=nicolas.ferre@atmel$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox