| Message ID | 1374189690-10810-8-git-send-email-sboyd@codeaurora.org (mailing list archive) |
|---|---|
| State | Deferred, archived |
| Headers | show |
On 07/18/2013 05:21 PM, 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. Acked-by: Stephen Warren <swarren@wwwdotorg.org> -- 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/19/2013 01:21 AM, 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: Stephen Warren <swarren@wwwdotorg.org> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > --- Hi Stephen, you sent a series with tick and clocksource changes. John is recipient of part of them. I replaced him to maintain the clocksource drivers. Is the series you sent for clocksource drivers supposed to be taken by me or by Russell ? In the future if there are no dependencies, it would be preferable to group the clocksource drivers changes into a series and send them to me. Thanks -- Daniel > drivers/clocksource/bcm2835_timer.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/clocksource/bcm2835_timer.c b/drivers/clocksource/bcm2835_timer.c > index 07ea7ce..26ed331 100644 > --- a/drivers/clocksource/bcm2835_timer.c > +++ b/drivers/clocksource/bcm2835_timer.c > @@ -49,7 +49,7 @@ struct bcm2835_timer { > > static void __iomem *system_clock __read_mostly; > > -static u32 notrace bcm2835_sched_read(void) > +static u64 notrace bcm2835_sched_read(void) > { > return readl_relaxed(system_clock); > } > @@ -110,7 +110,7 @@ static void __init bcm2835_timer_init(struct device_node *node) > panic("Can't read clock-frequency"); > > system_clock = base + REG_COUNTER_LO; > - setup_sched_clock(bcm2835_sched_read, 32, freq); > + sched_clock_register(bcm2835_sched_read, 32, freq); > > clocksource_mmio_init(base + REG_COUNTER_LO, node->name, > freq, 300, 32, clocksource_mmio_readl_up); >
On 07/30/2013 03:04 AM, Daniel Lezcano wrote: > On 07/19/2013 01:21 AM, 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: Stephen Warren <swarren@wwwdotorg.org> >> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> >> --- > Hi Stephen, > > you sent a series with tick and clocksource changes. > > John is recipient of part of them. I replaced him to maintain the > clocksource drivers. > > Is the series you sent for clocksource drivers supposed to be taken by > me or by Russell ? > > In the future if there are no dependencies, it would be preferable to > group the clocksource drivers changes into a series and send them to me. I believe there are some dependencies on the generic bits. I'm planning on queing the generic parts in one branch (to send to thomas), queuing the drivers/clocksource bits to send to you, but was waiting on an Ack from Catalin. I got busy with some other work items, so I haven't pushed these out yet, but I'll review things again and push them out today. thanks -john -- 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
diff --git a/drivers/clocksource/bcm2835_timer.c b/drivers/clocksource/bcm2835_timer.c index 07ea7ce..26ed331 100644 --- a/drivers/clocksource/bcm2835_timer.c +++ b/drivers/clocksource/bcm2835_timer.c @@ -49,7 +49,7 @@ struct bcm2835_timer { static void __iomem *system_clock __read_mostly; -static u32 notrace bcm2835_sched_read(void) +static u64 notrace bcm2835_sched_read(void) { return readl_relaxed(system_clock); } @@ -110,7 +110,7 @@ static void __init bcm2835_timer_init(struct device_node *node) panic("Can't read clock-frequency"); system_clock = base + REG_COUNTER_LO; - setup_sched_clock(bcm2835_sched_read, 32, freq); + sched_clock_register(bcm2835_sched_read, 32, freq); clocksource_mmio_init(base + REG_COUNTER_LO, node->name, freq, 300, 32, clocksource_mmio_readl_up);
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: Stephen Warren <swarren@wwwdotorg.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- drivers/clocksource/bcm2835_timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)