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: 49044 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CCC7F20BF2 for ; Thu, 28 May 2015 01:21:20 +0000 (UTC) Received: by wgez8 with SMTP id z8sf6365687wge.2 for ; Wed, 27 May 2015 18:21:20 -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:date:from:to:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent :cc:precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:content-type:content-transfer-encoding :sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=wLLxIEUJJkjK6bSX7yTbyovhMIh5kOmwkLWDSyiQ1po=; b=LGJAaRkvaa0Vzx35IZDsZ7new+glE7hmUbfHDCeMNjIefAOtRo4z8w00JlxqBNuN5+ WM/b4MK/UlPja4/g2ja4uaZE7xjHeiRFCCVvsFltNSi2kG4qaoGpNmRn6f35C//SqYaJ zsSIhlXpoXWUrTgeAP4ScRRAqEYOrNkOmK7BmbhbF/uv6jtv7j1alHMIIM2CHQmmBnq6 Y1ofO9iuytWyKro6ySTsRFlyr8wv+1jIcsminwZBaagJHXngbnpqhNFWHm4gJ9qXCu0x F41K61uObvU7RTRNfcH83cBJoHdsvZlNODjbx8yxwm5T9QRDW5ojGjqBSQBN5gFBXHHS wwuw== X-Gm-Message-State: ALoCoQlTkM2ln7nJQGAwc9j+mkA3L088l5DCzqcfch0nzClLoPExDO17xH7sSd6WnHOGrGHX1eds X-Received: by 10.112.200.166 with SMTP id jt6mr217809lbc.17.1432776080119; Wed, 27 May 2015 18:21:20 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.44.135 with SMTP id e7ls132220lam.79.gmail; Wed, 27 May 2015 18:21:20 -0700 (PDT) X-Received: by 10.112.105.104 with SMTP id gl8mr188014lbb.81.1432776079969; Wed, 27 May 2015 18:21:19 -0700 (PDT) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id as7si564994lbc.107.2015.05.27.18.21.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 May 2015 18:21:19 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by lbbuc2 with SMTP id uc2so18578522lbb.2 for ; Wed, 27 May 2015 18:21:19 -0700 (PDT) X-Received: by 10.112.29.36 with SMTP id g4mr233641lbh.56.1432776079647; Wed, 27 May 2015 18:21:19 -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 hn6csp766864lbb; Wed, 27 May 2015 18:21:18 -0700 (PDT) X-Received: by 10.70.88.145 with SMTP id bg17mr378096pdb.167.1432776077621; Wed, 27 May 2015 18:21:17 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id hc9si1002379pac.157.2015.05.27.18.21.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 May 2015 18:21:17 -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 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-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 (-) 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.220.47 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.220.47 listed in wl.mailspike.net] 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+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.178 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 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