From patchwork Mon May 25 05:14:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 48946 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 89E9921411 for ; Mon, 25 May 2015 05:18:59 +0000 (UTC) Received: by wgwl7 with SMTP id l7sf19381194wgw.0 for ; Sun, 24 May 2015 22:18:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list; bh=5GG0CW/I8zgbI8bAYnhmZ5x6Qv3qGC8Ng8cDPoo0DPc=; b=iaPtC2HurjYBRJiHIGrwAGx6kipW+jDqDRSrdiSUjSLQ2no2kM2y+Fw+G+Vy1msWKe 3bmoGW814U3SgdfQp1ihTkL3RevRMJRJY7ubUE0OV8RxTeG/XG7BVNFLZ5W/E34yojUe jXletUPKQaXKK8LQcxKroh6TnxvKY3Y/bgfbTARsk2p37IOGyUWxEOpOgveXYmG4dn9A cJ5+liea3eSsv+VfJ378lEmBZk6l0En1rs+rSLX8zKn5GpYkalAzVQuqmX3JE3hjfv9N DgT8Uu4hnbaFWet7Y1l+TyYdd4J818f3Y3c8C4HW91kOeUv3OJGz/c7DhXNozKlVth8Q /uoA== X-Gm-Message-State: ALoCoQmzxDhRllt/2joDGXZqNWtbxDU90MOlSzm2tFnogR+KfKEwEp9AGQSri2p32fcBcc2VyJ2n X-Received: by 10.152.2.169 with SMTP id 9mr20716966lav.1.1432531138771; Sun, 24 May 2015 22:18:58 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.29.169 with SMTP id l9ls747353lah.52.gmail; Sun, 24 May 2015 22:18:58 -0700 (PDT) X-Received: by 10.112.77.103 with SMTP id r7mr16399345lbw.63.1432531138627; Sun, 24 May 2015 22:18:58 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id xi9si7561658lbb.4.2015.05.24.22.18.58 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 May 2015 22:18:58 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by lami4 with SMTP id i4so42979961lam.0 for ; Sun, 24 May 2015 22:18:58 -0700 (PDT) X-Received: by 10.112.161.226 with SMTP id xv2mr16986580lbb.106.1432531138316; Sun, 24 May 2015 22:18:58 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1597349lbb; Sun, 24 May 2015 22:18:57 -0700 (PDT) X-Received: by 10.70.37.167 with SMTP id z7mr36755257pdj.55.1432531136503; Sun, 24 May 2015 22:18:56 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id g14si14527517pdf.232.2015.05.24.22.18.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 May 2015 22:18:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YwkkI-0004La-D9; Mon, 25 May 2015 05:16:14 +0000 Received: from mail-pd0-f173.google.com ([209.85.192.173]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YwkkA-0004KY-PZ for linux-arm-kernel@lists.infradead.org; Mon, 25 May 2015 05:16:10 +0000 Received: by pdbki1 with SMTP id ki1so20636071pdb.1 for ; Sun, 24 May 2015 22:15:44 -0700 (PDT) X-Received: by 10.68.57.170 with SMTP id j10mr36782826pbq.150.1432530944800; Sun, 24 May 2015 22:15:44 -0700 (PDT) Received: from localhost.localdomain ([104.207.83.5]) by mx.google.com with ESMTPSA id c13sm8653135pat.5.2015.05.24.22.15.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 24 May 2015 22:15:43 -0700 (PDT) From: Shawn Guo To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 12/12] ARM: imx: move timer driver into drivers/clocksource Date: Mon, 25 May 2015 13:14:09 +0800 Message-Id: <1432530849-12312-1-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1432308599-28643-13-git-send-email-shawn.guo@linaro.org> References: <1432308599-28643-13-git-send-email-shawn.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150524_221606_852766_7126B1F9 X-CRM114-Status: UNSURE ( 9.57 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.8 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.192.173 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.1 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.192.173 listed in wl.mailspike.net] Cc: Shawn Guo , Daniel Lezcano , Arnd Bergmann , kernel@pengutronix.de, Shenwei Wang X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: shawn.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 After the cleanup on imx timer driver, now it's ready to be moved into drivers/clocksource/. Let's do it. Signed-off-by: Shawn Guo --- Changes since v2: - Rename the file to timer-imx-gpt.c arch/arm/mach-imx/Makefile | 2 +- drivers/clocksource/Makefile | 1 + arch/arm/mach-imx/time.c => drivers/clocksource/timer-imx-gpt.c | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename arch/arm/mach-imx/time.c => drivers/clocksource/timer-imx-gpt.c (100%) diff --git a/arch/arm/mach-imx/time.c b/drivers/clocksource/timer-imx-gpt.c similarity index 100% rename from arch/arm/mach-imx/time.c rename to drivers/clocksource/timer-imx-gpt.c diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 799e65a530be..f70e18470799 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -1,4 +1,4 @@ -obj-y := time.o cpu.o system.o irq-common.o +obj-y := cpu.o system.o irq-common.o obj-$(CONFIG_SOC_IMX1) += mm-imx1.o obj-$(CONFIG_SOC_IMX21) += mm-imx21.o diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 5b85f6adb258..579e4bcf8763 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -52,3 +52,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP) += timer-integrator-ap.o obj-$(CONFIG_CLKSRC_VERSATILE) += versatile.o obj-$(CONFIG_CLKSRC_MIPS_GIC) += mips-gic-timer.o obj-$(CONFIG_ASM9260_TIMER) += asm9260_timer.o +obj-$(CONFIG_ARCH_MXC) += timer-imx-gpt.o