| Message ID | 1413377405-7503-1-git-send-email-dbaryshkov@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wednesday 15 October 2014 16:50:04 Dmitry Eremin-Solenikov wrote: > SA-11x0 platform used the same IP block as was used on PXA. Consequently > it makes sense to have only one driver. Enable pxa_timer clocksource for > StrongARM platform. > > Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Both patches look good to me. Acked-by: Arnd Bergmann <arnd@arndb.de> Should we merge them through arm-soc or through the clocksource tree? Arnd
2014-10-20 23:07 GMT+04:00 Arnd Bergmann <arnd@arndb.de>: > On Wednesday 15 October 2014 16:50:04 Dmitry Eremin-Solenikov wrote: >> SA-11x0 platform used the same IP block as was used on PXA. Consequently >> it makes sense to have only one driver. Enable pxa_timer clocksource for >> StrongARM platform. >> >> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> > > Both patches look good to me. > > Acked-by: Arnd Bergmann <arnd@arndb.de> > > Should we merge them through arm-soc or through the clocksource tree? I'm fine with any of the approaches. Russell, Daniel, Thomas - any preferences?
On Mon, 20 Oct 2014, Arnd Bergmann wrote: > On Wednesday 15 October 2014 16:50:04 Dmitry Eremin-Solenikov wrote: > > SA-11x0 platform used the same IP block as was used on PXA. Consequently > > it makes sense to have only one driver. Enable pxa_timer clocksource for > > StrongARM platform. > > > > Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> > > Both patches look good to me. > > Acked-by: Arnd Bergmann <arnd@arndb.de> > > Should we merge them through arm-soc or through the clocksource tree? It touches arm, so please take it through arm-soc with my acked-by. Thanks, tglx
Hello, 2014-10-20 23:07 GMT+04:00 Arnd Bergmann <arnd@arndb.de>: > On Wednesday 15 October 2014 16:50:04 Dmitry Eremin-Solenikov wrote: >> SA-11x0 platform used the same IP block as was used on PXA. Consequently >> it makes sense to have only one driver. Enable pxa_timer clocksource for >> StrongARM platform. >> >> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> > > Both patches look good to me. > > Acked-by: Arnd Bergmann <arnd@arndb.de> > > Should we merge them through arm-soc or through the clocksource tree? Thomas added his blessing (and an ack) to merge these patches through arm-soc. Should I gather any additional Acks before it cn hit arm-soc/for-next?
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index cfd6519..fd99b08 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -216,4 +216,10 @@ config CLKSRC_VERSATILE ARM Versatile, RealView and Versatile Express reference platforms. +config CLKSRC_PXA + def_bool y if ARCH_PXA || ARCH_SA1100 + help + This enables OST0 support available on PXA and SA-11x0 + platforms. + endmenu diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 7fd9fd1..6d9822e 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -20,7 +20,7 @@ obj-$(CONFIG_ARCH_CLPS711X) += clps711x-timer.o obj-$(CONFIG_ARCH_MARCO) += timer-marco.o obj-$(CONFIG_ARCH_MOXART) += moxart_timer.o obj-$(CONFIG_ARCH_MXS) += mxs_timer.o -obj-$(CONFIG_ARCH_PXA) += pxa_timer.o +obj-$(CONFIG_CLKSRC_PXA) += pxa_timer.o obj-$(CONFIG_ARCH_PRIMA2) += timer-prima2.o obj-$(CONFIG_ARCH_U300) += timer-u300.o obj-$(CONFIG_SUN4I_TIMER) += sun4i_timer.o
SA-11x0 platform used the same IP block as was used on PXA. Consequently it makes sense to have only one driver. Enable pxa_timer clocksource for StrongARM platform. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> --- drivers/clocksource/Kconfig | 6 ++++++ drivers/clocksource/Makefile | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)