| Message ID | 1425570594-13124-7-git-send-email-alexandre.belloni@free-electrons.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Thu, 2015-03-05 at 16:49 +0100, Alexandre Belloni wrote: > diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig > index 1c2506f68122..d1d15985a4ec 100644 > --- a/drivers/clocksource/Kconfig > +++ b/drivers/clocksource/Kconfig > @@ -138,6 +138,10 @@ config ATMEL_PIT > select CLKSRC_OF if OF > def_bool SOC_AT91SAM9 || SOC_SAMA5 > > +config ATMEL_ST > + select CLKSRC_OF if OF > + def_bool SOC_AT91RM9200 If you swap these two lines you'll make the set of people that probably only includes me a bit happier. > + > config CLKSRC_METAG_GENERIC > def_bool y if METAG > help Thanks, Paul Bolle -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 05/03/2015 at 20:41:33 +0100, Paul Bolle wrote : > On Thu, 2015-03-05 at 16:49 +0100, Alexandre Belloni wrote: > > diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig > > index 1c2506f68122..d1d15985a4ec 100644 > > --- a/drivers/clocksource/Kconfig > > +++ b/drivers/clocksource/Kconfig > > @@ -138,6 +138,10 @@ config ATMEL_PIT > > select CLKSRC_OF if OF > > def_bool SOC_AT91SAM9 || SOC_SAMA5 > > > > +config ATMEL_ST > > + select CLKSRC_OF if OF > > + def_bool SOC_AT91RM9200 > > If you swap these two lines you'll make the set of people that probably > only includes me a bit happier. > I'm all for making you happier ;) I'll respin next week, hopefully after getting more comments.
On 03/05/2015 04:49 PM, Alexandre Belloni wrote: > Import at91rm9200_time.c from mach-at91 as timer-atmel-st.c. Further cleanup is > required to get rid of the mach-at91 headers. > > Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> > Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> > --- > arch/arm/mach-at91/Makefile | 2 +- > drivers/clocksource/Kconfig | 4 ++++ > drivers/clocksource/Makefile | 1 + > .../at91rm9200_time.c => drivers/clocksource/timer-atmel-st.c | 0 > 4 files changed, 6 insertions(+), 1 deletion(-) > rename arch/arm/mach-at91/at91rm9200_time.c => drivers/clocksource/timer-atmel-st.c (100%) > > diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile > index 827fdbcce1c7..963c29169242 100644 > --- a/arch/arm/mach-at91/Makefile > +++ b/arch/arm/mach-at91/Makefile > @@ -7,7 +7,7 @@ obj-y := setup.o > obj-$(CONFIG_SOC_AT91SAM9) += sam9_smc.o > > # CPU-specific support > -obj-$(CONFIG_SOC_AT91RM9200) += at91rm9200.o at91rm9200_time.o > +obj-$(CONFIG_SOC_AT91RM9200) += at91rm9200.o > obj-$(CONFIG_SOC_AT91SAM9) += at91sam9.o > obj-$(CONFIG_SOC_SAMA5) += sama5.o > > diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig > index 1c2506f68122..d1d15985a4ec 100644 > --- a/drivers/clocksource/Kconfig > +++ b/drivers/clocksource/Kconfig > @@ -138,6 +138,10 @@ config ATMEL_PIT > select CLKSRC_OF if OF > def_bool SOC_AT91SAM9 || SOC_SAMA5 > > +config ATMEL_ST > + select CLKSRC_OF if OF > + def_bool SOC_AT91RM9200 > + H Alexandre, the global policy is to enable the timer from the platform Kconfig. So it should be: config ATMEL_ST bool select CLKSRC_OF if OF and change the mach's Kconfig to select this driver for the corresponding platform. > config CLKSRC_METAG_GENERIC > def_bool y if METAG > help > diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile > index 752d5c70b0ef..5b85f6adb258 100644 > --- a/drivers/clocksource/Makefile > +++ b/drivers/clocksource/Makefile > @@ -1,5 +1,6 @@ > obj-$(CONFIG_CLKSRC_OF) += clksrc-of.o > obj-$(CONFIG_ATMEL_PIT) += timer-atmel-pit.o > +obj-$(CONFIG_ATMEL_ST) += timer-atmel-st.o > obj-$(CONFIG_ATMEL_TCB_CLKSRC) += tcb_clksrc.o > obj-$(CONFIG_X86_PM_TIMER) += acpi_pm.o > obj-$(CONFIG_SCx200HR_TIMER) += scx200_hrt.o > diff --git a/arch/arm/mach-at91/at91rm9200_time.c b/drivers/clocksource/timer-atmel-st.c > similarity index 100% > rename from arch/arm/mach-at91/at91rm9200_time.c > rename to drivers/clocksource/timer-atmel-st.c >
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 827fdbcce1c7..963c29169242 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -7,7 +7,7 @@ obj-y := setup.o obj-$(CONFIG_SOC_AT91SAM9) += sam9_smc.o # CPU-specific support -obj-$(CONFIG_SOC_AT91RM9200) += at91rm9200.o at91rm9200_time.o +obj-$(CONFIG_SOC_AT91RM9200) += at91rm9200.o obj-$(CONFIG_SOC_AT91SAM9) += at91sam9.o obj-$(CONFIG_SOC_SAMA5) += sama5.o diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 1c2506f68122..d1d15985a4ec 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -138,6 +138,10 @@ config ATMEL_PIT select CLKSRC_OF if OF def_bool SOC_AT91SAM9 || SOC_SAMA5 +config ATMEL_ST + select CLKSRC_OF if OF + def_bool SOC_AT91RM9200 + config CLKSRC_METAG_GENERIC def_bool y if METAG help diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 752d5c70b0ef..5b85f6adb258 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -1,5 +1,6 @@ obj-$(CONFIG_CLKSRC_OF) += clksrc-of.o obj-$(CONFIG_ATMEL_PIT) += timer-atmel-pit.o +obj-$(CONFIG_ATMEL_ST) += timer-atmel-st.o obj-$(CONFIG_ATMEL_TCB_CLKSRC) += tcb_clksrc.o obj-$(CONFIG_X86_PM_TIMER) += acpi_pm.o obj-$(CONFIG_SCx200HR_TIMER) += scx200_hrt.o