| Message ID | 1462797169-14512-3-git-send-email-joel@jms.id.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Daniel, Here's a commit message for this patch. If you'd prefer me to resend the entire series with this included then I can do that. This patch abstracts the enable and disable register writes into their own functions in preparation for future changes to use SoC specific values for the writes. > Signed-off-by: Joel Stanley <joel@jms.id.au> > --- > drivers/clocksource/moxart_timer.c | 22 ++++++++++++++++------ > 1 file changed, 16 insertions(+), 6 deletions(-) > > diff --git a/drivers/clocksource/moxart_timer.c b/drivers/clocksource/moxart_timer.c > index 19857af651c1..b00b2b21e8b3 100644 > --- a/drivers/clocksource/moxart_timer.c > +++ b/drivers/clocksource/moxart_timer.c > @@ -58,15 +58,25 @@ > static void __iomem *base; > static unsigned int clock_count_per_tick; > > -static int moxart_shutdown(struct clock_event_device *evt) > +static inline void moxart_disable(struct clock_event_device *evt) > { > writel(TIMER1_DISABLE, base + TIMER_CR); > +} > + > +static inline void moxart_enable(struct clock_event_device *evt) > +{ > + writel(TIMER1_ENABLE, base + TIMER_CR); > +} > + > +static int moxart_shutdown(struct clock_event_device *evt) > +{ > + moxart_disable(evt); > return 0; > } > > static int moxart_set_oneshot(struct clock_event_device *evt) > { > - writel(TIMER1_DISABLE, base + TIMER_CR); > + moxart_disable(evt); > writel(~0, base + TIMER1_BASE + REG_LOAD); > return 0; > } > @@ -74,21 +84,21 @@ static int moxart_set_oneshot(struct clock_event_device *evt) > static int moxart_set_periodic(struct clock_event_device *evt) > { > writel(clock_count_per_tick, base + TIMER1_BASE + REG_LOAD); > - writel(TIMER1_ENABLE, base + TIMER_CR); > + moxart_enable(evt); > return 0; > } > > static int moxart_clkevt_next_event(unsigned long cycles, > - struct clock_event_device *unused) > + struct clock_event_device *evt) > { > u32 u; > > - writel(TIMER1_DISABLE, base + TIMER_CR); > + moxart_disable(evt); > > u = readl(base + TIMER1_BASE + REG_COUNT) - cycles; > writel(u, base + TIMER1_BASE + REG_MATCH1); > > - writel(TIMER1_ENABLE, base + TIMER_CR); > + moxart_enable(evt); > > return 0; > } > -- > 2.8.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On Tue, May 10, 2016 at 08:36:50PM +0930, Joel Stanley wrote: > Hi Daniel, > > Here's a commit message for this patch. If you'd prefer me to resend > the entire series with this included then I can do that. No, it is ok (except if there are comments on the patches before I merge them). > This patch abstracts the enable and disable register writes into their > own functions in preparation for future changes to use SoC specific > values for the writes. Thanks ! -- Daniel
Hello Daniel, On Tue, May 10, 2016 at 10:34 PM, Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > On Tue, May 10, 2016 at 08:36:50PM +0930, Joel Stanley wrote: >> Hi Daniel, >> >> Here's a commit message for this patch. If you'd prefer me to resend >> the entire series with this included then I can do that. > > No, it is ok (except if there are comments on the patches before I merge > them). I couldn't find this in your tree. Any chance I could get it merged now? Cheers, Joel > >> This patch abstracts the enable and disable register writes into their >> own functions in preparation for future changes to use SoC specific >> values for the writes.
On Wed, Jul 20, 2016 at 02:47:15PM +0930, Joel Stanley wrote: > Hello Daniel, > > On Tue, May 10, 2016 at 10:34 PM, Daniel Lezcano > <daniel.lezcano@linaro.org> wrote: > > On Tue, May 10, 2016 at 08:36:50PM +0930, Joel Stanley wrote: > >> Hi Daniel, > >> > >> Here's a commit message for this patch. If you'd prefer me to resend > >> the entire series with this included then I can do that. > > > > No, it is ok (except if there are comments on the patches before I merge > > them). > > I couldn't find this in your tree. Any chance I could get it merged now? Hi Joel, actually I forgot to include your patchset which is no longer applying correctly and the conflicts are not trivials (easy but not trivial). It is a bit late to ask for a last minute pull. Sorry for that. Please respin and resend your patchset, I will include it in my tree immediately so that won't happen again. The patch 1/4 is no longer needed. If there is a really urgent need of this series, please let us know and Thomas can take a decision accordingly. -- Daniel
On Wed, 2016-07-20 at 10:14 +0200, Daniel Lezcano wrote: > > actually I forgot to include your patchset which is no longer applying > correctly and the conflicts are not trivials (easy but not trivial). It is a > bit late to ask for a last minute pull. Sorry for that. > > Please respin and resend your patchset, I will include it in my tree > immediately so that won't happen again. The patch 1/4 is no longer needed. > > If there is a really urgent need of this series, please let us know and > Thomas can take a decision accordingly. I think all the other bits to have basic support for the Aspeed SoC are in except this one, so it would be nice for this to make the merge window... Cheers, Ben.
diff --git a/drivers/clocksource/moxart_timer.c b/drivers/clocksource/moxart_timer.c index 19857af651c1..b00b2b21e8b3 100644 --- a/drivers/clocksource/moxart_timer.c +++ b/drivers/clocksource/moxart_timer.c @@ -58,15 +58,25 @@ static void __iomem *base; static unsigned int clock_count_per_tick; -static int moxart_shutdown(struct clock_event_device *evt) +static inline void moxart_disable(struct clock_event_device *evt) { writel(TIMER1_DISABLE, base + TIMER_CR); +} + +static inline void moxart_enable(struct clock_event_device *evt) +{ + writel(TIMER1_ENABLE, base + TIMER_CR); +} + +static int moxart_shutdown(struct clock_event_device *evt) +{ + moxart_disable(evt); return 0; } static int moxart_set_oneshot(struct clock_event_device *evt) { - writel(TIMER1_DISABLE, base + TIMER_CR); + moxart_disable(evt); writel(~0, base + TIMER1_BASE + REG_LOAD); return 0; } @@ -74,21 +84,21 @@ static int moxart_set_oneshot(struct clock_event_device *evt) static int moxart_set_periodic(struct clock_event_device *evt) { writel(clock_count_per_tick, base + TIMER1_BASE + REG_LOAD); - writel(TIMER1_ENABLE, base + TIMER_CR); + moxart_enable(evt); return 0; } static int moxart_clkevt_next_event(unsigned long cycles, - struct clock_event_device *unused) + struct clock_event_device *evt) { u32 u; - writel(TIMER1_DISABLE, base + TIMER_CR); + moxart_disable(evt); u = readl(base + TIMER1_BASE + REG_COUNT) - cycles; writel(u, base + TIMER1_BASE + REG_MATCH1); - writel(TIMER1_ENABLE, base + TIMER_CR); + moxart_enable(evt); return 0; }
Signed-off-by: Joel Stanley <joel@jms.id.au> --- drivers/clocksource/moxart_timer.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)