| Message ID | 20171113233427.5386-5-afaerber@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Daniel, Am 14.11.2017 um 00:34 schrieb Andreas Färber: > Actions S700 has two 2Hz timers like S500, and four TIMx timers like S900. > > Signed-off-by: Andreas Färber <afaerber@suse.de> > --- > v1 -> v2: > * Adopted TIMER_OF_DECLARE() (Daniel) > > drivers/clocksource/owl-timer.c | 1 + > 1 file changed, 1 insertion(+) Are you planning to queue this v2 patch for 4.16? Thanks, Andreas
On 05/12/2017 00:00, Andreas Färber wrote: > Hi Daniel, > > Am 14.11.2017 um 00:34 schrieb Andreas Färber: >> Actions S700 has two 2Hz timers like S500, and four TIMx timers like S900. >> >> Signed-off-by: Andreas Färber <afaerber@suse.de> >> --- >> v1 -> v2: >> * Adopted TIMER_OF_DECLARE() (Daniel) >> >> drivers/clocksource/owl-timer.c | 1 + >> 1 file changed, 1 insertion(+) > > Are you planning to queue this v2 patch for 4.16? Yeah, what about the patch 1/8 ?
Am 07.12.2017 um 10:23 schrieb Daniel Lezcano: > On 05/12/2017 00:00, Andreas Färber wrote: >> Hi Daniel, >> >> Am 14.11.2017 um 00:34 schrieb Andreas Färber: >>> Actions S700 has two 2Hz timers like S500, and four TIMx timers like S900. >>> >>> Signed-off-by: Andreas Färber <afaerber@suse.de> >>> --- >>> v1 -> v2: >>> * Adopted TIMER_OF_DECLARE() (Daniel) >>> >>> drivers/clocksource/owl-timer.c | 1 + >>> 1 file changed, 1 insertion(+) >> >> Are you planning to queue this v2 patch for 4.16? > > Yeah, what about the patch 1/8 ? In linux-next already. If you take 2-4, I can take 5; if you'd rather have me take the binding, fine with me as well. Thanks, Andreas
On 07/12/2017 13:47, Andreas Färber wrote: > Am 07.12.2017 um 10:23 schrieb Daniel Lezcano: >> On 05/12/2017 00:00, Andreas Färber wrote: >>> Hi Daniel, >>> >>> Am 14.11.2017 um 00:34 schrieb Andreas Färber: >>>> Actions S700 has two 2Hz timers like S500, and four TIMx timers like S900. >>>> >>>> Signed-off-by: Andreas Färber <afaerber@suse.de> >>>> --- >>>> v1 -> v2: >>>> * Adopted TIMER_OF_DECLARE() (Daniel) >>>> >>>> drivers/clocksource/owl-timer.c | 1 + >>>> 1 file changed, 1 insertion(+) >>> >>> Are you planning to queue this v2 patch for 4.16? >> >> Yeah, what about the patch 1/8 ? > > In linux-next already. Yeah, but that does not mean the patch is merged. Do you mean it is merged in arm-soc, so it is visible in linux-next? > If you take 2-4, I can take 5; if you'd rather have me take the binding, > fine with me as well. I will take patches 2-4. Thanks. -- Daniel
Am 07.12.2017 um 14:11 schrieb Daniel Lezcano: > On 07/12/2017 13:47, Andreas Färber wrote: >> Am 07.12.2017 um 10:23 schrieb Daniel Lezcano: >>> On 05/12/2017 00:00, Andreas Färber wrote: >>>> Hi Daniel, >>>> >>>> Am 14.11.2017 um 00:34 schrieb Andreas Färber: >>>>> Actions S700 has two 2Hz timers like S500, and four TIMx timers like S900. >>>>> >>>>> Signed-off-by: Andreas Färber <afaerber@suse.de> >>>>> --- >>>>> v1 -> v2: >>>>> * Adopted TIMER_OF_DECLARE() (Daniel) >>>>> >>>>> drivers/clocksource/owl-timer.c | 1 + >>>>> 1 file changed, 1 insertion(+) >>>> >>>> Are you planning to queue this v2 patch for 4.16? >>> >>> Yeah, what about the patch 1/8 ? >> >> In linux-next already. > > Yeah, but that does not mean the patch is merged. Do you mean it is > merged in arm-soc, so it is visible in linux-next? No, I am waiting to send my initial 4.16 pull to arm-soc and wanted to clarify what (if anything) from this series can still go into that pull. >> If you take 2-4, I can take 5; if you'd rather have me take the binding, >> fine with me as well. > > I will take patches 2-4. Thanks, Andreas
On 14/11/2017 00:34, Andreas Färber wrote: > Actions S700 has two 2Hz timers like S500, and four TIMx timers like S900. > > Signed-off-by: Andreas Färber <afaerber@suse.de> > --- Applied for 4.16. Thanks -- Daniel
diff --git a/drivers/clocksource/owl-timer.c b/drivers/clocksource/owl-timer.c index 9fb4333cfb8a..ea00a5e8f95d 100644 --- a/drivers/clocksource/owl-timer.c +++ b/drivers/clocksource/owl-timer.c @@ -169,4 +169,5 @@ static int __init owl_timer_init(struct device_node *node) return 0; } TIMER_OF_DECLARE(owl_s500, "actions,s500-timer", owl_timer_init); +TIMER_OF_DECLARE(owl_s700, "actions,s700-timer", owl_timer_init); TIMER_OF_DECLARE(owl_s900, "actions,s900-timer", owl_timer_init);
Actions S700 has two 2Hz timers like S500, and four TIMx timers like S900. Signed-off-by: Andreas Färber <afaerber@suse.de> --- v1 -> v2: * Adopted TIMER_OF_DECLARE() (Daniel) drivers/clocksource/owl-timer.c | 1 + 1 file changed, 1 insertion(+)