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: 6472581 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1FE21C0020 for ; Mon, 25 May 2015 05:20:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4C3E6204D1 for ; Mon, 25 May 2015 05:20:08 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 84D16204C9 for ; Mon, 25 May 2015 05:20:04 +0000 (UTC) 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-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6YHTtVqj3DqKr5tPbQwLCcGzBtBuRiHpaE+T4kYJJIU=; b=Uq19nI5DejAbSlM6ZZCZ27P/9y1u688xgdtjfLjSnr2ZZR2+Th1EY2/rHm5/9W2Abp MaAKeripaGQwC/ZWJyuDtFBtIEUb6vAjLJ8yYm3eLqMvL2P2D7GzFwbR2DBTEKXKhIyR /KLolmtXKX5Eqln+Qh7q+xWRuuJwn+ly/308tVE0bdfztyFuUf9dLLeRz+/hoxps6JJB Kr5v1sZQCBH0Q9Bin6OV2qKQVECqC3kQf5ynv5Efg9qyjpLhf9sFs1+cbB2oIJDGSJ4x 0cgBSMxsSvI6nru1laN8gIQez3qgII2QU2uV2pWxAxQSd5x5e1jVIES4+NjbnAF7mhib UL4Q== X-Gm-Message-State: ALoCoQlawcesXgDdOoI5YQPzew35l4Bm6MkClC+10jHCul9JC/VTDxjJHWbKC5Eo2zeMsl8L15fy 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 (-) 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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