From patchwork Tue Aug 6 02:07:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 264840 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::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 ABA7C2C0084 for ; Tue, 6 Aug 2013 12:07:50 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V6WgT-0002BX-R6; Tue, 06 Aug 2013 02:07:38 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V6WgR-0007tj-Ii; Tue, 06 Aug 2013 02:07:35 +0000 Received: from kirsty.vergenet.net ([202.4.237.240]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V6WgN-0007tA-7X for linux-arm-kernel@lists.infradead.org; Tue, 06 Aug 2013 02:07:32 +0000 Received: from ayumi.isobedori.kobe.vergenet.net (p8155-ipbfp801kobeminato.hyogo.ocn.ne.jp [118.10.107.155]) by kirsty.vergenet.net (Postfix) with ESMTP id 8D11025BF23; Tue, 6 Aug 2013 12:07:08 +1000 (EST) Received: by ayumi.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id 2BC65EDE107; Tue, 6 Aug 2013 11:07:07 +0900 (JST) Date: Tue, 6 Aug 2013 11:07:07 +0900 From: Simon Horman To: Magnus Damm Subject: Re: [PATCH 12/13] ARM: shmobile: Use clocksource_of_init() on r8a7790 Message-ID: <20130806020705.GC20940@verge.net.au> References: <20130731190110.31796.96552.sendpatchset@w520> <20130731190300.31796.23926.sendpatchset@w520> <20130806012855.GB20940@verge.net.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130806012855.GB20940@verge.net.au> Organisation: Horms Solutions Ltd. 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-20130805_220731_777820_71B92E58 X-CRM114-Status: GOOD ( 24.26 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [202.4.237.240 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: olof@lixom.net, linux-arm-kernel@lists.infradead.org, arnd@arndb.de, linux-sh@vger.kernel.org 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 On Tue, Aug 06, 2013 at 10:28:56AM +0900, Simon Horman wrote: > On Thu, Aug 01, 2013 at 04:03:00AM +0900, Magnus Damm wrote: > > From: Magnus Damm > > > > Replace the call to shmobile_timer_init() with > > clocksource_of_init(). This will allow us to > > get rid of shmobile_timer_init(). > > > > Signed-off-by: Magnus Damm > > --- > > > > arch/arm/mach-shmobile/setup-r8a7790.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > --- 0001/arch/arm/mach-shmobile/setup-r8a7790.c > > +++ work/arch/arm/mach-shmobile/setup-r8a7790.c 2013-08-01 03:17:48.000000000 +0900 > > @@ -263,7 +263,7 @@ void __init r8a7790_timer_init(void) > > iounmap(base); > > #endif /* CONFIG_ARM_ARCH_TIMER */ > > > > - shmobile_timer_init(); > > + clocksource_of_init(); > > } > > > > void __init r8a7790_init_delay(void) > > I seem to need the following: > > diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c > index 7301255..d0f5c9f 100644 > --- a/arch/arm/mach-shmobile/setup-r8a7790.c > +++ b/arch/arm/mach-shmobile/setup-r8a7790.c > @@ -18,6 +18,7 @@ > * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA > */ > > +#include > #include > #include > #include > > > To avoid: > > ... > CC arch/arm/mach-shmobile/setup-r8a7790.o > arch/arm/mach-shmobile/setup-r8a7790.c: In function ‘r8a7790_timer_init’: > arch/arm/mach-shmobile/setup-r8a7790.c:266:2: error: implicit declaration of function ‘clocksource_of_init’ [-Werror=implicit-function-declaration] > cc1: some warnings being treated as errors > make[1]: *** [arch/arm/mach-shmobile/setup-r8a7790.o] Error 1 As discussed off-line, I have squashed the above change into your patch. The result, which I plan to push shortly, is as follows: From: Magnus Damm ARM: shmobile: Use clocksource_of_init() on r8a7790 Replace the call to shmobile_timer_init() with clocksource_of_init(). This will allow us to get rid of shmobile_timer_init(). Signed-off-by: Magnus Damm [horms+renesas@verge.net.au: include linux/clocksource.h] Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/setup-r8a7790.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c index 86cf507..6d4aa04 100644 --- a/arch/arm/mach-shmobile/setup-r8a7790.c +++ b/arch/arm/mach-shmobile/setup-r8a7790.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include #include @@ -263,7 +264,7 @@ void __init r8a7790_timer_init(void) iounmap(base); #endif /* CONFIG_ARM_ARCH_TIMER */ - shmobile_timer_init(); + clocksource_of_init(); } void __init r8a7790_init_delay(void)