From patchwork Thu May 28 01:18:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 6495651 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 60C119F38C for ; Thu, 28 May 2015 01:21:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 80AA02072E for ; Thu, 28 May 2015 01:21:49 +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 4645D20727 for ; Thu, 28 May 2015 01:21:48 +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 1YxmTv-00011q-OV; Thu, 28 May 2015 01:19:35 +0000 Received: from mail-pa0-f47.google.com ([209.85.220.47]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YxmTs-00010w-KO for linux-arm-kernel@lists.infradead.org; Thu, 28 May 2015 01:19:33 +0000 Received: by padbw4 with SMTP id bw4so10677455pad.0 for ; Wed, 27 May 2015 18:19:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=VY+Fow+Nh4KO4gnaAIm7FHSnfgu9N2rndPVlFae7pfE=; b=JdS3h1n5RBjKgSXAZyyK/i8xctFbr3m1VVMB4iR9mUoZHmW/eBCs2R026M6juZUv4T wy/00fCeujBLrgReERKOYhAGCprCwK7xUvzRzUwocbtMARpLAQD/oz3zErVRKl+DVlFx GGbRjfUtvucaDDDH3y2JH/vF9AKePNy49zLxeGfs/uNllIUADYYXOE3x1LIMNWOBmi9q jmUzGkWghWe1Bc/TkEs/iXJd9cV6eh1K+yY7j4Jh1JYF2PUGgqryJDiyCW5goMp59xg0 EW56aqvPVtEztFXziR8hQzDv2z8E0jJVdt+4+gkNCyFjB9tdwqA9vtlqukgFS7hWtqZ6 lwyA== X-Gm-Message-State: ALoCoQkHklm3SN4Kn8O+zZQOVoG4F8ywdAeLeGN36Dbm61w1gMeBSUvMRC55mV1bTLrimTR2CtoA X-Received: by 10.70.118.73 with SMTP id kk9mr457627pdb.150.1432775951043; Wed, 27 May 2015 18:19:11 -0700 (PDT) Received: from dragon ([43.224.32.42]) by mx.google.com with ESMTPSA id mq2sm412785pbb.16.2015.05.27.18.19.08 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 27 May 2015 18:19:10 -0700 (PDT) Date: Thu, 28 May 2015 09:18:15 +0800 From: Shawn Guo To: Daniel Lezcano Subject: Re: [PATCH v3 12/12] ARM: imx: move timer driver into drivers/clocksource Message-ID: <20150528011813.GK16165@dragon> References: <1432308599-28643-13-git-send-email-shawn.guo@linaro.org> <1432530849-12312-1-git-send-email-shawn.guo@linaro.org> <5565BD93.50600@linaro.org> <20150527140448.GJ16165@dragon> <556655BA.3020903@linaro.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <556655BA.3020903@linaro.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150527_181932_869784_A5C14085 X-CRM114-Status: GOOD ( 14.73 ) X-Spam-Score: -1.8 (-) Cc: Shenwei Wang , Arnd Bergmann , kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org 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: , 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 On Thu, May 28, 2015 at 01:39:38AM +0200, Daniel Lezcano wrote: > please use the same as: > > https://lkml.org/lkml/2015/5/22/855 > > and then add in the platform's Kconfig the timer option as: > > https://lkml.org/lkml/2015/5/22/937 Okay, here it is. ------8<-------------------------- From fac8436459ad63531b2c39d4f060fd9420f93efd Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Fri, 15 May 2015 15:41:00 +0800 Subject: [PATCH] ARM: imx: move timer driver into drivers/clocksource 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 Acked-by: Daniel Lezcano --- arch/arm/mach-imx/Kconfig | 2 +- arch/arm/mach-imx/Makefile | 2 +- drivers/clocksource/Kconfig | 6 ++++++ drivers/clocksource/Makefile | 1 + arch/arm/mach-imx/time.c => drivers/clocksource/timer-imx-gpt.c | 0 5 files changed, 9 insertions(+), 2 deletions(-) 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/Kconfig b/arch/arm/mach-imx/Kconfig index 1d8707885c57..f5813f9f31df 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -2,7 +2,7 @@ menuconfig ARCH_MXC bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 select ARCH_REQUIRE_GPIOLIB select ARM_CPU_SUSPEND if PM - select CLKSRC_MMIO + select CLKSRC_IMX_GPT select GENERIC_IRQ_CHIP select PINCTRL select PM_OPP if PM 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/Kconfig b/drivers/clocksource/Kconfig index 51d7865fdddb..139a20795073 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -258,4 +258,10 @@ config CLKSRC_PXA help This enables OST0 support available on PXA and SA-11x0 platforms. + +config CLKSRC_IMX_GPT + bool "Clocksource using i.MX GPT" if COMPILE_TEST + depends on OF + select CLKSRC_MMIO + endmenu diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 5b85f6adb258..fce332cac646 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -51,4 +51,5 @@ obj-$(CONFIG_ARCH_KEYSTONE) += timer-keystone.o 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_CLKSRC_IMX_GPT) += timer-imx-gpt.o obj-$(CONFIG_ASM9260_TIMER) += asm9260_timer.o