| Message ID | 1375309877-16617-18-git-send-email-sboyd@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08/01/13 07:31, Stephen Boyd wrote: > The 32 bit sched_clock interface now supports 64 bits. Upgrade to > the 64 bit function to allow us to remove the 32 bit registration > interface. > > Cc: Ben Dooks<ben-linux@fluff.org> > Cc: Kukjin Kim<kgene.kim@samsung.com> Acked-by: Kukjin Kim <kgene.kim@samsung.com> Thanks, Kukjin > Signed-off-by: Stephen Boyd<sboyd@codeaurora.org> > --- > arch/arm/plat-samsung/samsung-time.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/plat-samsung/samsung-time.c b/arch/arm/plat-samsung/samsung-time.c > index 2957075..1e2119b 100644 > --- a/arch/arm/plat-samsung/samsung-time.c > +++ b/arch/arm/plat-samsung/samsung-time.c > @@ -312,7 +312,7 @@ static void __iomem *samsung_timer_reg(void) > * this wraps around for now, since it is just a relative time > * stamp. (Inspired by U300 implementation.) > */ > -static u32 notrace samsung_read_sched_clock(void) > +static u64 notrace samsung_read_sched_clock(void) > { > void __iomem *reg = samsung_timer_reg(); > > @@ -337,7 +337,7 @@ static void __init samsung_clocksource_init(void) > samsung_time_setup(timer_source.source_id, TCNT_MAX); > samsung_time_start(timer_source.source_id, PERIODIC); > > - setup_sched_clock(samsung_read_sched_clock, TSIZE, clock_rate); > + sched_clock_register(samsung_read_sched_clock, TSIZE, clock_rate); > > if (clocksource_mmio_init(samsung_timer_reg(), "samsung_clocksource_timer", > clock_rate, 250, TSIZE, clocksource_mmio_readl_down))
diff --git a/arch/arm/plat-samsung/samsung-time.c b/arch/arm/plat-samsung/samsung-time.c index 2957075..1e2119b 100644 --- a/arch/arm/plat-samsung/samsung-time.c +++ b/arch/arm/plat-samsung/samsung-time.c @@ -312,7 +312,7 @@ static void __iomem *samsung_timer_reg(void) * this wraps around for now, since it is just a relative time * stamp. (Inspired by U300 implementation.) */ -static u32 notrace samsung_read_sched_clock(void) +static u64 notrace samsung_read_sched_clock(void) { void __iomem *reg = samsung_timer_reg(); @@ -337,7 +337,7 @@ static void __init samsung_clocksource_init(void) samsung_time_setup(timer_source.source_id, TCNT_MAX); samsung_time_start(timer_source.source_id, PERIODIC); - setup_sched_clock(samsung_read_sched_clock, TSIZE, clock_rate); + sched_clock_register(samsung_read_sched_clock, TSIZE, clock_rate); if (clocksource_mmio_init(samsung_timer_reg(), "samsung_clocksource_timer", clock_rate, 250, TSIZE, clocksource_mmio_readl_down))
The 32 bit sched_clock interface now supports 64 bits. Upgrade to the 64 bit function to allow us to remove the 32 bit registration interface. Cc: Ben Dooks <ben-linux@fluff.org> Cc: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- arch/arm/plat-samsung/samsung-time.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)