* [PATCH-3.12.y 2/2] clocksource: dw_apb_timer_of: Fix support for dts binding "snps,dw-apb-timer"
2013-12-19 22:30 [PATCH-3.12.y 1/2] clocksource: dw_apb_timer_of: Fix read_sched_clock Daniel Lezcano
@ 2013-12-19 22:30 ` Daniel Lezcano
2014-01-07 17:34 ` [PATCH-3.12.y 1/2] clocksource: dw_apb_timer_of: Fix read_sched_clock Luis Henriques
1 sibling, 0 replies; 3+ messages in thread
From: Daniel Lezcano @ 2013-12-19 22:30 UTC (permalink / raw)
To: gregkh; +Cc: linux-kernel, stable, dinguyen, baruch, tglx
From: Dinh Nguyen <dinguyen@altera.com>
Upstream commit 9ab4727
In commit 620f5e1cbf (dts: Rename DW APB timer compatible strings), both
"snps,dw-apb-timer-sp" and "snps,dw-apb-timer-osc" were deprecated in place
of "snps,dw-apb-timer". But the driver also needs to be udpated in order to
support this new binding "snps,dw-apb-timer".
Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/clocksource/dw_apb_timer_of.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/clocksource/dw_apb_timer_of.c b/drivers/clocksource/dw_apb_timer_of.c
index 33fd4ff..b386be6 100644
--- a/drivers/clocksource/dw_apb_timer_of.c
+++ b/drivers/clocksource/dw_apb_timer_of.c
@@ -113,7 +113,6 @@ static u32 read_sched_clock(void)
static const struct of_device_id sptimer_ids[] __initconst = {
{ .compatible = "picochip,pc3x2-rtc" },
- { .compatible = "snps,dw-apb-timer-sp" },
{ /* Sentinel */ },
};
@@ -153,4 +152,6 @@ static void __init dw_apb_timer_init(struct device_node *timer)
num_called++;
}
CLOCKSOURCE_OF_DECLARE(pc3x2_timer, "picochip,pc3x2-timer", dw_apb_timer_init);
-CLOCKSOURCE_OF_DECLARE(apb_timer, "snps,dw-apb-timer-osc", dw_apb_timer_init);
+CLOCKSOURCE_OF_DECLARE(apb_timer_osc, "snps,dw-apb-timer-osc", dw_apb_timer_init);
+CLOCKSOURCE_OF_DECLARE(apb_timer_sp, "snps,dw-apb-timer-sp", dw_apb_timer_init);
+CLOCKSOURCE_OF_DECLARE(apb_timer, "snps,dw-apb-timer", dw_apb_timer_init);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH-3.12.y 1/2] clocksource: dw_apb_timer_of: Fix read_sched_clock
2013-12-19 22:30 [PATCH-3.12.y 1/2] clocksource: dw_apb_timer_of: Fix read_sched_clock Daniel Lezcano
2013-12-19 22:30 ` [PATCH-3.12.y 2/2] clocksource: dw_apb_timer_of: Fix support for dts binding "snps,dw-apb-timer" Daniel Lezcano
@ 2014-01-07 17:34 ` Luis Henriques
1 sibling, 0 replies; 3+ messages in thread
From: Luis Henriques @ 2014-01-07 17:34 UTC (permalink / raw)
To: Daniel Lezcano; +Cc: gregkh, linux-kernel, stable, dinguyen, baruch, tglx
On Thu, Dec 19, 2013 at 11:30:13PM +0100, Daniel Lezcano wrote:
> From: Dinh Nguyen <dinguyen@altera.com>
>
> Upstream commit 85dc6ee
>
> The read_sched_clock should return the ~value because the clock is a
> countdown implementation. read_sched_clock() should be the same as
> __apbt_read_clocksource().
>
> Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> ---
> drivers/clocksource/dw_apb_timer_of.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/clocksource/dw_apb_timer_of.c b/drivers/clocksource/dw_apb_timer_of.c
> index 4cbae4f..33fd4ff 100644
> --- a/drivers/clocksource/dw_apb_timer_of.c
> +++ b/drivers/clocksource/dw_apb_timer_of.c
> @@ -108,7 +108,7 @@ static void add_clocksource(struct device_node *source_timer)
>
> static u32 read_sched_clock(void)
> {
> - return __raw_readl(sched_io_base);
> + return ~__raw_readl(sched_io_base);
> }
>
> static const struct of_device_id sptimer_ids[] __initconst = {
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
I believe these 2 patches are also applicable to the 3.11 kernel. Unless
there are any objection, I'm queuing it for the next release.
Cheers,
--
Luis
^ permalink raw reply [flat|nested] 3+ messages in thread