From patchwork Tue Jan 21 13:52:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 23442 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f69.google.com (mail-pb0-f69.google.com [209.85.160.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 015DD203BE for ; Tue, 21 Jan 2014 13:52:42 +0000 (UTC) Received: by mail-pb0-f69.google.com with SMTP id md12sf8571609pbc.0 for ; Tue, 21 Jan 2014 05:52:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=ZE9nXzTFScMMYv5yFAvzImMOpSwjYSCSu/E8cIe740U=; b=mTl/anBBvr5x3+tlZU+VZyYtWjl8Gui56TZ+KnNqryXoWPj5wNXL1nm5jWfgQA+CGO 3oSfrVcQOrQrcBIvy70Bhiub456xQismGiBZ1Go0P1AU1o0rFedcn71cn1iHe6CAxuwM 3n+qsu0f+CPj/zuy9NxN8Rp+zwpvtLNki6K/zXa2cXRFfGOtuF9nKZrz6alBhREe0I80 kJnwxrN1mEvKJc1FcLFmsMsjc21YA9PXR01J2k3ODI3tTyOLk1lQX2ZoFIP004ioMwPv Ohvznr3K8FgdOLreK0+3mAcbA4Y8pkO/95bEIDKqQUr/966vbmrXdoWgbBKPYPd499aJ iy9A== X-Gm-Message-State: ALoCoQk48NXCNjgfB/j/T5BNuMCxJhOmLx/eF65Xfk1Nm3kIjZauDG6RMTzKf5chWyzHu0i31zKq X-Received: by 10.66.146.65 with SMTP id ta1mr9000552pab.19.1390312362159; Tue, 21 Jan 2014 05:52:42 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.88.100 with SMTP id bf4ls1994972qeb.1.gmail; Tue, 21 Jan 2014 05:52:42 -0800 (PST) X-Received: by 10.58.67.9 with SMTP id j9mr14331479vet.3.1390312362018; Tue, 21 Jan 2014 05:52:42 -0800 (PST) Received: from mail-vb0-f48.google.com (mail-vb0-f48.google.com [209.85.212.48]) by mx.google.com with ESMTPS id uc1si2068992vcb.53.2014.01.21.05.52.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 21 Jan 2014 05:52:42 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.48 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.48; Received: by mail-vb0-f48.google.com with SMTP id q16so3453272vbe.7 for ; Tue, 21 Jan 2014 05:52:41 -0800 (PST) X-Received: by 10.58.94.195 with SMTP id de3mr156754veb.39.1390312361933; Tue, 21 Jan 2014 05:52:41 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp118435vcz; Tue, 21 Jan 2014 05:52:41 -0800 (PST) X-Received: by 10.194.110.41 with SMTP id hx9mr19544698wjb.28.1390312360323; Tue, 21 Jan 2014 05:52:40 -0800 (PST) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id ne3si3489797wic.68.2014.01.21.05.52.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 21 Jan 2014 05:52:40 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.82.50; Received: by mail-wg0-f50.google.com with SMTP id l18so8094064wgh.5 for ; Tue, 21 Jan 2014 05:52:39 -0800 (PST) X-Received: by 10.194.24.65 with SMTP id s1mr19249877wjf.38.1390312359851; Tue, 21 Jan 2014 05:52:39 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id z1sm7919819wjq.19.2014.01.21.05.52.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jan 2014 05:52:38 -0800 (PST) From: Linus Walleij To: linux-kernel@vger.kernel.org, Daniel Lezcano , Thomas Gleixner Cc: Linus Walleij Subject: [PATCH] ARM: u300: move timer driver to clocksource Date: Tue, 21 Jan 2014 14:52:34 +0100 Message-Id: <1390312354-32689-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.4.2 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.48 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 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.