summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDinh Nguyen <dinguyen@altera.com>2013-12-10 19:49:18 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-09 12:24:24 -0800
commit3da8d9a6ae084d013bfe1b47c319380a91c7012a (patch)
treeeb59056547d490e218090a0575b12ad608791104
parent0fdb9385a5909c218fa2cf0cf62896ebe0fcf30e (diff)
downloadlinux-3.10-3da8d9a6ae084d013bfe1b47c319380a91c7012a.tar.gz
linux-3.10-3da8d9a6ae084d013bfe1b47c319380a91c7012a.tar.bz2
linux-3.10-3da8d9a6ae084d013bfe1b47c319380a91c7012a.zip
clocksource: dw_apb_timer_of: Fix read_sched_clock
commit 85dc6ee1237c8a4a7742e6abab96a20389b7d682 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/clocksource/dw_apb_timer_of.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/dw_apb_timer_of.c b/drivers/clocksource/dw_apb_timer_of.c
index 6b02eddc5f5..f22417cb096 100644
--- a/drivers/clocksource/dw_apb_timer_of.c
+++ b/drivers/clocksource/dw_apb_timer_of.c
@@ -77,7 +77,7 @@ static void __iomem *sched_io_base;
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 = {