| Message ID | 1374189690-10810-11-git-send-email-sboyd@codeaurora.org (mailing list archive) |
|---|---|
| State | Deferred, archived |
| Headers | show |
On Thu, Jul 18, 2013 at 04:21:23PM -0700, 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: Shawn Guo <shawn.guo@linaro.org> Acked-by: Shawn Guo <shawn.guo@linaro.org> BTW, will the series break setup_sched_clock() users that are not converted, like arch/arm/mach-imx/time.c? I can understand that's the consequence of not moving things into drivers/ folder :) Shawn > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > --- > drivers/clocksource/mxs_timer.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/clocksource/mxs_timer.c b/drivers/clocksource/mxs_timer.c > index 0f5e65f..445b68a 100644 > --- a/drivers/clocksource/mxs_timer.c > +++ b/drivers/clocksource/mxs_timer.c > @@ -222,7 +222,7 @@ static struct clocksource clocksource_mxs = { > .flags = CLOCK_SOURCE_IS_CONTINUOUS, > }; > > -static u32 notrace mxs_read_sched_clock_v2(void) > +static u64 notrace mxs_read_sched_clock_v2(void) > { > return ~readl_relaxed(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1)); > } > @@ -236,7 +236,7 @@ static int __init mxs_clocksource_init(struct clk *timer_clk) > else { > clocksource_mmio_init(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1), > "mxs_timer", c, 200, 32, clocksource_mmio_readl_down); > - setup_sched_clock(mxs_read_sched_clock_v2, 32, c); > + sched_clock_register(mxs_read_sched_clock_v2, 32, c); > } > > return 0; > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > hosted by The Linux Foundation > -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 07/22, Shawn Guo wrote: > On Thu, Jul 18, 2013 at 04:21:23PM -0700, 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: Shawn Guo <shawn.guo@linaro.org> > > Acked-by: Shawn Guo <shawn.guo@linaro.org> > > BTW, will the series break setup_sched_clock() users that are not > converted, like arch/arm/mach-imx/time.c? I can understand that's the > consequence of not moving things into drivers/ folder :) Thanks. I will convert all arch/arm users when this series is pulled into the tip tree. The arm patches will have to go through the arm-soc branch and so we'll need some stable branch in tip for that.
diff --git a/drivers/clocksource/mxs_timer.c b/drivers/clocksource/mxs_timer.c index 0f5e65f..445b68a 100644 --- a/drivers/clocksource/mxs_timer.c +++ b/drivers/clocksource/mxs_timer.c @@ -222,7 +222,7 @@ static struct clocksource clocksource_mxs = { .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; -static u32 notrace mxs_read_sched_clock_v2(void) +static u64 notrace mxs_read_sched_clock_v2(void) { return ~readl_relaxed(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1)); } @@ -236,7 +236,7 @@ static int __init mxs_clocksource_init(struct clk *timer_clk) else { clocksource_mmio_init(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1), "mxs_timer", c, 200, 32, clocksource_mmio_readl_down); - setup_sched_clock(mxs_read_sched_clock_v2, 32, c); + sched_clock_register(mxs_read_sched_clock_v2, 32, c); } return 0;
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: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- drivers/clocksource/mxs_timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)