From patchwork Fri May 22 15:29:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 48905 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8EDCC21411 for ; Fri, 22 May 2015 15:42:13 +0000 (UTC) Received: by wgcz3 with SMTP id z3sf6275705wgc.3 for ; Fri, 22 May 2015 08:42:12 -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=Qjpy5NQsWDqZenOZReWvtQj8OXYA4EfBYVpvFspCbTU=; b=hV3ek+KUbW/9fk+0qbhUx+5/kJgS60aP9thWwZhqxsSYv0CCglUu7jxB7tKbFVcxCY fiXI+28xbrTpPca7ZAIkmCMoU3bf99DK014fyTIK25RYEBuQ+r2BDDeDccxT1utDOXLv Hp5mUg6a3/Gk/fY5s//yycJwBMY+Adz/DqnGT1EbhrUvm0wcCqmJvAwTAw8NrYbbzvjy Z9zQNQZCpglHaIFHB35j9XidiGOQZdi+ynynM5RN63r9gTz9RqOPYLtUFcYMNeitV1y2 dNntmrRxfMDeyVqH0d2bXNue6eGlsPHcAqiOeSoDpbAMdACfN9J9YeE2A8CKN8Z1PRCL TyTA== X-Gm-Message-State: ALoCoQkSxSMGGiE8KZB+jZIJddudXAt7mbh0eeupH9hdF9gJTLcSqvjVQcGb5xqKAsMtZhKrGYMU X-Received: by 10.152.37.101 with SMTP id x5mr8306692laj.5.1432309332866; Fri, 22 May 2015 08:42:12 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.116.7 with SMTP id js7ls486377lab.34.gmail; Fri, 22 May 2015 08:42:12 -0700 (PDT) X-Received: by 10.112.125.231 with SMTP id mt7mr28944lbb.113.1432309332719; Fri, 22 May 2015 08:42:12 -0700 (PDT) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com. [209.85.217.175]) by mx.google.com with ESMTPS id dy9si1636031lac.58.2015.05.22.08.42.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 May 2015 08:42:12 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) client-ip=209.85.217.175; Received: by lbbqq2 with SMTP id qq2so15613648lbb.3 for ; Fri, 22 May 2015 08:42:12 -0700 (PDT) X-Received: by 10.112.163.168 with SMTP id yj8mr6933610lbb.36.1432309332580; Fri, 22 May 2015 08:42:12 -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 hn6csp1499962lbb; Fri, 22 May 2015 08:42:11 -0700 (PDT) X-Received: by 10.68.231.98 with SMTP id tf2mr16942459pbc.12.1432309329249; Fri, 22 May 2015 08:42:09 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id ey2si3918329pbc.164.2015.05.22.08.42.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 May 2015 08:42:09 -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 1Yvp30-0004jx-St; Fri, 22 May 2015 15:39:42 +0000 Received: from mail-pd0-f169.google.com ([209.85.192.169]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YvowD-0006pd-Sw for linux-arm-kernel@lists.infradead.org; Fri, 22 May 2015 15:32:42 +0000 Received: by pdbnk13 with SMTP id nk13so22212091pdb.1 for ; Fri, 22 May 2015 08:32:21 -0700 (PDT) X-Received: by 10.70.16.229 with SMTP id j5mr16908720pdd.66.1432308740926; Fri, 22 May 2015 08:32:20 -0700 (PDT) Received: from localhost.localdomain ([107.6.117.178]) by mx.google.com with ESMTPSA id as1sm2474485pbc.39.2015.05.22.08.32.15 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 May 2015 08:32:20 -0700 (PDT) From: Shawn Guo To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 12/12] ARM: imx: move timer driver into drivers/clocksource Date: Fri, 22 May 2015 23:29:59 +0800 Message-Id: <1432308599-28643-13-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1432308599-28643-1-git-send-email-shawn.guo@linaro.org> References: <1432308599-28643-1-git-send-email-shawn.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150522_083242_022338_C01A1D6C X-CRM114-Status: UNSURE ( 8.95 ) 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.169 listed in list.dnswl.org] -1.1 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.192.169 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 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.217.175 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 --- arch/arm/mach-imx/Makefile | 2 +- drivers/clocksource/Makefile | 1 + arch/arm/mach-imx/time.c => drivers/clocksource/timer-imx.c | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename arch/arm/mach-imx/time.c => drivers/clocksource/timer-imx.c (100%) diff --git a/arch/arm/mach-imx/time.c b/drivers/clocksource/timer-imx.c similarity index 100% rename from arch/arm/mach-imx/time.c rename to drivers/clocksource/timer-imx.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..5c5a89479631 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.o