From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754776AbaAUOIL (ORCPT ); Tue, 21 Jan 2014 09:08:11 -0500 Received: from mail-we0-f170.google.com ([74.125.82.170]:46948 "EHLO mail-we0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754244AbaAUOIK (ORCPT ); Tue, 21 Jan 2014 09:08:10 -0500 Message-ID: <52DE7F48.5000207@linaro.org> Date: Tue, 21 Jan 2014 15:08:08 +0100 From: Daniel Lezcano User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Linus Walleij , linux-kernel@vger.kernel.org, Thomas Gleixner Subject: Re: [PATCH] ARM: u300: move timer driver to clocksource References: <1390312354-32689-1-git-send-email-linus.walleij@linaro.org> In-Reply-To: <1390312354-32689-1-git-send-email-linus.walleij@linaro.org> 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/21/2014 02:52 PM, Linus Walleij wrote: > Move the U300 timer driver down to the clocksource driver > subsystem and keep arch/arm clean. > > Cc: Daniel Lezcano > Cc: Thomas Gleixner > Signed-off-by: Linus Walleij Hi Linus, I applied this patch on my tree for 3.15. Thanks ! -- Daniel > --- > Hi Daniel/tglx, if you prefer I can take this through ARM SoC > but since I'm listed as maintainer for this driver and nothing > much is happening on the U300, feel free to apply it to your > tree. > --- > MAINTAINERS | 1 + > arch/arm/mach-u300/Makefile | 2 +- > drivers/clocksource/Makefile | 1 + > arch/arm/mach-u300/timer.c => drivers/clocksource/timer-u300.c | 4 ---- > 4 files changed, 3 insertions(+), 5 deletions(-) > rename arch/arm/mach-u300/timer.c => drivers/clocksource/timer-u300.c (99%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 6a6e4ac72287..ede1049b2aa0 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1296,6 +1296,7 @@ M: Linus Walleij > L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) > S: Supported > F: arch/arm/mach-u300/ > +F: drivers/clocksource/timer-u300.c > F: drivers/i2c/busses/i2c-stu300.c > F: drivers/rtc/rtc-coh901331.c > F: drivers/watchdog/coh901327_wdt.c > diff --git a/arch/arm/mach-u300/Makefile b/arch/arm/mach-u300/Makefile > index 0f362b64fb87..3ec74ac95bc1 100644 > --- a/arch/arm/mach-u300/Makefile > +++ b/arch/arm/mach-u300/Makefile > @@ -2,7 +2,7 @@ > # Makefile for the linux kernel, U300 machine. > # > > -obj-y := core.o timer.o > +obj-y := core.o > obj-m := > obj-n := > obj- := > diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile > index 33621efb9148..dc17673d7397 100644 > --- a/drivers/clocksource/Makefile > +++ b/drivers/clocksource/Makefile > @@ -21,6 +21,7 @@ obj-$(CONFIG_ARCH_MARCO) += timer-marco.o > obj-$(CONFIG_ARCH_MOXART) += moxart_timer.o > obj-$(CONFIG_ARCH_MXS) += mxs_timer.o > obj-$(CONFIG_ARCH_PRIMA2) += timer-prima2.o > +obj-$(CONFIG_ARCH_U300) += timer-u300.o > obj-$(CONFIG_SUN4I_TIMER) += sun4i_timer.o > obj-$(CONFIG_ARCH_TEGRA) += tegra20_timer.o > obj-$(CONFIG_VT8500_TIMER) += vt8500_timer.o > diff --git a/arch/arm/mach-u300/timer.c b/drivers/clocksource/timer-u300.c > similarity index 99% > rename from arch/arm/mach-u300/timer.c > rename to drivers/clocksource/timer-u300.c > index 5226162fac69..79722349955e 100644 > --- a/arch/arm/mach-u300/timer.c > +++ b/drivers/clocksource/timer-u300.c > @@ -1,8 +1,4 @@ > /* > - * > - * arch/arm/mach-u300/timer.c > - * > - * > * Copyright (C) 2007-2009 ST-Ericsson AB > * License terms: GNU General Public License (GPL) version 2 > * Timer COH 901 328, runs the OS timer interrupt. > -- Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog