From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755436AbbAOQRS (ORCPT ); Thu, 15 Jan 2015 11:17:18 -0500 Received: from mail-we0-f172.google.com ([74.125.82.172]:49232 "EHLO mail-we0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752551AbbAOQRP (ORCPT ); Thu, 15 Jan 2015 11:17:15 -0500 Message-ID: <54B7E807.4050301@linaro.org> Date: Thu, 15 Jan 2015 17:17:11 +0100 From: Daniel Lezcano User-Agent: Mozilla/5.0 (X11; Linux i686; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Alexandre Belloni , Nicolas Ferre CC: Boris Brezillon , Jean-Christophe Plagniol-Villard , Thomas Gleixner , Samuel Ortiz , Lee Jones , Wim Van Sebroeck , Guenter Roeck , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-watchdog@vger.kernel.org Subject: Re: [PATCH v3 4/8] ARM: at91: time: move the system timer driver to drivers/clocksource References: <1421077023-30954-1-git-send-email-alexandre.belloni@free-electrons.com> <1421077023-30954-5-git-send-email-alexandre.belloni@free-electrons.com> In-Reply-To: <1421077023-30954-5-git-send-email-alexandre.belloni@free-electrons.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/12/2015 04:36 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 > Acked-by: Boris Brezillon Acked-by: Daniel Lezcano > --- > 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 7b6424d40764..5d1ee3a6f115 100644 > --- a/arch/arm/mach-at91/Makefile > +++ b/arch/arm/mach-at91/Makefile > @@ -7,7 +7,7 @@ obj-y := setup.o sysirq_mask.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_AT91SAM9260) += at91sam9260.o > obj-$(CONFIG_SOC_AT91SAM9261) += at91sam9261.o > obj-$(CONFIG_SOC_AT91SAM9263) += at91sam9263.o > diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig > index fc01ec27d3c8..ebc6dd77136e 100644 > --- a/drivers/clocksource/Kconfig > +++ b/drivers/clocksource/Kconfig > @@ -128,6 +128,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 94d90b24b56b..b7380ded4e4c 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 > -- Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog