| Message ID | 1375884321-30489-1-git-send-email-baozich@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Chen Baozi <baozich@gmail.com> [130807 07:18]: > The denominator should be load from INCREMENTOR_DENUMERATOR_RELOAD_OFFSET > rather than INCREMENTER_NUMERATOR_OFFSET. > > This is more likely a typo, since INCREMENTER_DENUMERATOR_RELOAD[23:17] is > reserved. It seems that it won't make much trouble without this fix, because > the useful [11:0] bits are mask and set the right value. Anyway, reading > from a right address is better choice. Thanks applying to omap-for-v3.12/fixes-non-critical. Tony > Signed-off-by: Chen Baozi <baozich@gmail.com> > --- > arch/arm/mach-omap2/timer.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c > index 1e77f11..ccc5c72 100644 > --- a/arch/arm/mach-omap2/timer.c > +++ b/arch/arm/mach-omap2/timer.c > @@ -537,7 +537,7 @@ static void __init realtime_counter_init(void) > reg |= num; > __raw_writel(reg, base + INCREMENTER_NUMERATOR_OFFSET); > > - reg = __raw_readl(base + INCREMENTER_NUMERATOR_OFFSET) & > + reg = __raw_readl(base + INCREMENTER_DENUMERATOR_RELOAD_OFFSET) & > NUMERATOR_DENUMERATOR_MASK; > reg |= den; > __raw_writel(reg, base + INCREMENTER_DENUMERATOR_RELOAD_OFFSET); > -- > 1.8.1.4 >
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 1e77f11..ccc5c72 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -537,7 +537,7 @@ static void __init realtime_counter_init(void) reg |= num; __raw_writel(reg, base + INCREMENTER_NUMERATOR_OFFSET); - reg = __raw_readl(base + INCREMENTER_NUMERATOR_OFFSET) & + reg = __raw_readl(base + INCREMENTER_DENUMERATOR_RELOAD_OFFSET) & NUMERATOR_DENUMERATOR_MASK; reg |= den; __raw_writel(reg, base + INCREMENTER_DENUMERATOR_RELOAD_OFFSET);
The denominator should be load from INCREMENTOR_DENUMERATOR_RELOAD_OFFSET rather than INCREMENTER_NUMERATOR_OFFSET. This is more likely a typo, since INCREMENTER_DENUMERATOR_RELOAD[23:17] is reserved. It seems that it won't make much trouble without this fix, because the useful [11:0] bits are mask and set the right value. Anyway, reading from a right address is better choice. Signed-off-by: Chen Baozi <baozich@gmail.com> --- arch/arm/mach-omap2/timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)