From patchwork Mon Mar 3 10:06:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Jacques Hiblot X-Patchwork-Id: 3753511 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E64C8BF13A for ; Mon, 3 Mar 2014 10:52:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 10DBB20397 for ; Mon, 3 Mar 2014 10:52:17 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 AD25F20396 for ; Mon, 3 Mar 2014 10:52:15 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WKPqz-00023c-3o; Mon, 03 Mar 2014 10:12:09 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WKPqQ-0001rG-7q; Mon, 03 Mar 2014 10:11:34 +0000 Received: from mail-wg0-f48.google.com ([74.125.82.48]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WKPph-0001hm-1S for linux-arm-kernel@lists.infradead.org; Mon, 03 Mar 2014 10:10:54 +0000 Received: by mail-wg0-f48.google.com with SMTP id b13so2956406wgh.7 for ; Mon, 03 Mar 2014 02:10:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=c0tDuUmdTwbZ7Mr84kkMv5HLiCV7De2UB5oum+gb4k0=; b=O2h99xk+fgDWyj2hVF6wJDwITQh+/sk6ctnmyH23y99XVKQBJUGcMt/eS2K+DjNAXS 6JukjtWqqzk1pGYxQbiUnymtf+pCtSoI6VDiKWpi8KU6ydJNkZnY90sbxt1OczVZennz c976UWSkQoeHFPGuq2GucsRrpPuDif8POwrQt4+jEtA+Woathb4z9lecs57GszMZWNc9 VC3Mowwz6FGiG9JaqVu4sV5ZfBn4TxFntx7A+2o+fCiaG6grs7cba9ojI5i5JGfqFGR3 OCxu10ch0vXQvaUAON9SNydKOMesmgBKnzD3ibcRdMt19ELG9yEzd8W81UEtcfNHbzaQ T9DQ== X-Received: by 10.195.13.234 with SMTP id fb10mr7772251wjd.50.1393841426565; Mon, 03 Mar 2014 02:10:26 -0800 (PST) Received: from stedf17-labo202.ds.jdsu.net. (4-161.80-90.static-ip.oleane.fr. [90.80.161.4]) by mx.google.com with ESMTPSA id t5sm32769710wjw.15.2014.03.03.02.10.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Mar 2014 02:10:25 -0800 (PST) From: Jean-Jacques Hiblot To: nicolas.ferre@atmel.com Subject: [PATCH v5 8/9] ARM: at91: prepare common clk transition for sam9261 SoC Date: Mon, 3 Mar 2014 11:06:01 +0100 Message-Id: <1393841162-25339-9-git-send-email-jjhiblot@traphandler.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1393841162-25339-1-git-send-email-jjhiblot@traphandler.com> References: <1393841162-25339-1-git-send-email-jjhiblot@traphandler.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140303_051050_720474_F19DA53C X-CRM114-Status: UNSURE ( 9.28 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: thomas.petazzoni@free-electrons.com, devicetree@vger.kernel.org, Jean-Jacques Hiblot , linux-kernel@vger.kernel.org, b.brezillon@overkiz.com, alexandre.belloni@free-electrons.com, gregory.clement@free-electrons.com, plagnioj@jcrosoft.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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, 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 This patch encloses sam9261 old clk registration in "#if defined(CONFIG_OLD_CLK_AT91) #endif" sections. Signed-off-by: Jean-Jacques Hiblot --- arch/arm/mach-at91/at91sam9261.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c index 5c90581..3345a2b 100644 --- a/arch/arm/mach-at91/at91sam9261.c +++ b/arch/arm/mach-at91/at91sam9261.c @@ -25,10 +25,12 @@ #include "at91_rstc.h" #include "soc.h" #include "generic.h" -#include "clock.h" #include "sam9_smc.h" #include "pm.h" +#if defined(CONFIG_OLD_CLK_AT91) +#include "clock.h" + /* -------------------------------------------------------------------- * Clocks * -------------------------------------------------------------------- */ @@ -264,7 +266,9 @@ static void __init at91sam9261_register_clocks(void) clk_register(&hck0); clk_register(&hck1); } - +#else +#define at91sam9261_register_clocks NULL +#endif /* -------------------------------------------------------------------- * GPIO * -------------------------------------------------------------------- */