From patchwork Mon Mar 25 15:17:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 230744 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1172B2C008C for ; Tue, 26 Mar 2013 02:24:05 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UK9BS-00058T-1u; Mon, 25 Mar 2013 15:19:38 +0000 Received: from co9ehsobe002.messaging.microsoft.com ([207.46.163.25] helo=co9outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UK993-0004EU-Jf for linux-arm-kernel@lists.infradead.org; Mon, 25 Mar 2013 15:17:10 +0000 Received: from mail22-co9-R.bigfish.com (10.236.132.252) by CO9EHSOBE042.bigfish.com (10.236.130.105) with Microsoft SMTP Server id 14.1.225.23; Mon, 25 Mar 2013 15:17:07 +0000 Received: from mail22-co9 (localhost [127.0.0.1]) by mail22-co9-R.bigfish.com (Postfix) with ESMTP id CF9361C0328; Mon, 25 Mar 2013 15:17:06 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1f42h1ee6h1de0h1202h1e76h1d1ah1d2ahzz8275dhz2dh87h2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1155h) X-FB-DOMAIN-IP-MATCH: fail Received: from mail22-co9 (localhost.localdomain [127.0.0.1]) by mail22-co9 (MessageSwitch) id 1364224623995940_15724; Mon, 25 Mar 2013 15:17:03 +0000 (UTC) Received: from CO9EHSMHS018.bigfish.com (unknown [10.236.132.237]) by mail22-co9.bigfish.com (Postfix) with ESMTP id DF34F300281; Mon, 25 Mar 2013 15:17:03 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO9EHSMHS018.bigfish.com (10.236.130.28) with Microsoft SMTP Server (TLS) id 14.1.225.23; Mon, 25 Mar 2013 15:16:57 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server (TLS) id 14.2.328.11; Mon, 25 Mar 2013 15:16:56 +0000 Received: from S2101-09.ap.freescale.net ([10.192.185.59]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r2PFGhFF010835; Mon, 25 Mar 2013 08:16:55 -0700 From: Shawn Guo To: Subject: [PATCH 6/6] ARM: mxs: move timer driver into drivers/clocksource Date: Mon, 25 Mar 2013 23:17:32 +0800 Message-ID: <1364224652-28332-7-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1364224652-28332-1-git-send-email-shawn.guo@linaro.org> References: <1364224652-28332-1-git-send-email-shawn.guo@linaro.org> MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130325_111709_827472_0C654C74 X-CRM114-Status: UNSURE ( 8.03 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [207.46.163.25 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Shawn Guo X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Move mxs timer driver into drivers/clocksource as mxs_timer.c. Signed-off-by: Shawn Guo --- arch/arm/mach-mxs/Makefile | 2 +- drivers/clocksource/Makefile | 1 + .../timer.c => drivers/clocksource/mxs_timer.c | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename arch/arm/mach-mxs/timer.c => drivers/clocksource/mxs_timer.c (100%) diff --git a/arch/arm/mach-mxs/timer.c b/drivers/clocksource/mxs_timer.c similarity index 100% rename from arch/arm/mach-mxs/timer.c rename to drivers/clocksource/mxs_timer.c diff --git a/arch/arm/mach-mxs/Makefile b/arch/arm/mach-mxs/Makefile index 3d3c8a9..76c336e 100644 --- a/arch/arm/mach-mxs/Makefile +++ b/arch/arm/mach-mxs/Makefile @@ -1,5 +1,5 @@ # Common support -obj-y := icoll.o ocotp.o system.o timer.o mm.o +obj-y := icoll.o ocotp.o system.o mm.o obj-$(CONFIG_PM) += pm.o diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 4d8283a..89c5adc 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_CLKSRC_NOMADIK_MTU) += nomadik-mtu.o obj-$(CONFIG_CLKSRC_DBX500_PRCMU) += clksrc-dbx500-prcmu.o obj-$(CONFIG_ARMADA_370_XP_TIMER) += time-armada-370-xp.o obj-$(CONFIG_ARCH_BCM2835) += bcm2835_timer.o +obj-$(CONFIG_ARCH_MXS) += mxs_timer.o obj-$(CONFIG_SUNXI_TIMER) += sunxi_timer.o obj-$(CONFIG_ARCH_TEGRA) += tegra20_timer.o obj-$(CONFIG_VT8500_TIMER) += vt8500_timer.o