* Jon Hunter <jon-hunter@xxxxxx> [121108 12:43]: > > On 11/02/2012 07:32 AM, Vaibhav Bedia wrote: > > AM33XX has only one usable timer in the WKUP domain. > > Currently the timer instance in WKUP domain is used > > as the clockevent and the timer in non-WKUP domain > > as the clocksource. The timer in WKUP domain can keep > > running in suspend from a 32K clock and hence serve > > as the persistent clock. To enable this, interchange > > the timers used as clocksource and clockevent for > > AM33XX. A subsequent patch will add suspend-resume > > support for the clockevent to ensure that there are > > no issues with timekeeping. > > > > Signed-off-by: Vaibhav Bedia <vaibhav.bedia@xxxxxx> > > --- > > arch/arm/mach-omap2/timer.c | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c > > index 565e575..6584ee0 100644 > > --- a/arch/arm/mach-omap2/timer.c > > +++ b/arch/arm/mach-omap2/timer.c > > @@ -460,7 +460,7 @@ OMAP_SYS_TIMER(3_secure) > > #endif > > > > #ifdef CONFIG_SOC_AM33XX > > -OMAP_SYS_TIMER_INIT(3_am33xx, 1, OMAP4_MPU_SOURCE, 2, OMAP4_MPU_SOURCE) > > +OMAP_SYS_TIMER_INIT(3_am33xx, 2, OMAP4_MPU_SOURCE, 1, OMAP4_MPU_SOURCE) > > OMAP_SYS_TIMER(3_am33xx) > > #endif > > By the way, for v3.8 (assuming that timer DT patches go in, currently > queued in Tony's master), when booting with DT the clock-source and > clock-events will be selected by timer feature and not ID. So you may > wish to rebase on top of Tony's master. Please don't base anything going upstream on the master branch except for testing. The master branch is just a merge of the upstream heading branches, and cannot be used as a base for pulling into anything. In this case the right branch to use as a base is omap-for-v3.8/dt. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
