From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753376AbaFZF07 (ORCPT ); Thu, 26 Jun 2014 01:26:59 -0400 Received: from top.free-electrons.com ([176.31.233.9]:40980 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752799AbaFZF05 (ORCPT ); Thu, 26 Jun 2014 01:26:57 -0400 Message-ID: <53ABAF1E.5030405@free-electrons.com> Date: Thu, 26 Jun 2014 07:26:54 +0200 From: Boris BREZILLON User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: Maxime Ripard , linux@maxim.org.za, Nicolas Ferre , Jean-Christophe Plagniol-Villard , Daniel Lezcano CC: Boris Brezillon , Alexandre Belloni , Thomas Petazzoni , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 13/13] AT91: PIT: Move the driver to drivers/clocksource References: <1403701605-26678-1-git-send-email-maxime.ripard@free-electrons.com> <1403701605-26678-14-git-send-email-maxime.ripard@free-electrons.com> In-Reply-To: <1403701605-26678-14-git-send-email-maxime.ripard@free-electrons.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 25/06/2014 15:06, Maxime Ripard wrote: > Now that we don't depend on anyting in the mach-at91 directory, we can just > move the driver to where it belongs. > > Signed-off-by: Maxime Ripard > --- > arch/arm/mach-at91/Kconfig | 4 ---- > arch/arm/mach-at91/Makefile | 1 - > drivers/clocksource/Kconfig | 4 ++++ > drivers/clocksource/Makefile | 1 + > {arch/arm/mach-at91 => drivers/clocksource}/at91sam926x_time.c | 0 > 5 files changed, 5 insertions(+), 5 deletions(-) > rename {arch/arm/mach-at91 => drivers/clocksource}/at91sam926x_time.c (100%) > > diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig > index a64412a020d3..b10db0990999 100644 > --- a/arch/arm/mach-at91/Kconfig > +++ b/arch/arm/mach-at91/Kconfig > @@ -36,10 +36,6 @@ config AT91_SAM9G45_RESET > bool > default !ARCH_AT91X40 > > -config AT91_SAM9_TIME > - select CLKSRC_OF if OF > - bool > - > config HAVE_AT91_SMD > bool > > diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile > index 78e9cec282f4..1a916ececbfd 100644 > --- a/arch/arm/mach-at91/Makefile > +++ b/arch/arm/mach-at91/Makefile > @@ -10,7 +10,6 @@ obj- := > obj-$(CONFIG_OLD_CLK_AT91) += clock.o > obj-$(CONFIG_AT91_SAM9_ALT_RESET) += at91sam9_alt_reset.o > obj-$(CONFIG_AT91_SAM9G45_RESET) += at91sam9g45_reset.o > -obj-$(CONFIG_AT91_SAM9_TIME) += at91sam926x_time.o > obj-$(CONFIG_SOC_AT91SAM9) += sam9_smc.o > > # CPU-specific support > diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig > index 065131cbfcc0..cd8b73ddbef3 100644 > --- a/drivers/clocksource/Kconfig > +++ b/drivers/clocksource/Kconfig > @@ -118,6 +118,10 @@ config CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK > help > Use ARM global timer clock source as sched_clock > > +config AT91_SAM9_TIME > + select CLKSRC_OF if OF > + bool > + > config CLKSRC_METAG_GENERIC > def_bool y if METAG > help > diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile > index 800b1303c236..3088928070f8 100644 > --- a/drivers/clocksource/Makefile > +++ b/drivers/clocksource/Makefile > @@ -1,5 +1,6 @@ > obj-$(CONFIG_CLKSRC_OF) += clksrc-of.o > obj-$(CONFIG_ATMEL_TCB_CLKSRC) += tcb_clksrc.o > +obj-$(CONFIG_AT91_SAM9_TIME) += at91sam926x_time.o I would rename both Kconfig and source file name into ATMEL_PIT and atmel_pit.c (or AT91_PIT and atmel_pit.c) to cleary show that this driver add support for the PIT block. > obj-$(CONFIG_X86_PM_TIMER) += acpi_pm.o > obj-$(CONFIG_SCx200HR_TIMER) += scx200_hrt.o > obj-$(CONFIG_CS5535_CLOCK_EVENT_SRC) += cs5535-clockevt.o > diff --git a/arch/arm/mach-at91/at91sam926x_time.c b/drivers/clocksource/at91sam926x_time.c > similarity index 100% > rename from arch/arm/mach-at91/at91sam926x_time.c > rename to drivers/clocksource/at91sam926x_time.c -- Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com