From patchwork Thu Jan 23 15:57:08 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: 3529781 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2D30D9F391 for ; Thu, 23 Jan 2014 16:03:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2887820181 for ; Thu, 23 Jan 2014 16:03:26 +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 DE2EE20179 for ; Thu, 23 Jan 2014 16:03:24 +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 1W6MjB-0005xi-Aw; Thu, 23 Jan 2014 16:02:01 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6Miw-0005A4-98; Thu, 23 Jan 2014 16:01:46 +0000 Received: from mail-we0-f181.google.com ([74.125.82.181]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6MiL-00052t-GX for linux-arm-kernel@lists.infradead.org; Thu, 23 Jan 2014 16:01:13 +0000 Received: by mail-we0-f181.google.com with SMTP id u56so1400049wes.12 for ; Thu, 23 Jan 2014 08:00:47 -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=ljoqsBLseTEe888u7765fs+PNUhUCQkQMNaeYn6M5yU=; b=CAg8FxOzN09k/dv4OM4FDMdsJWk6asLkcFWBqreU4osTcUk/UCAZ/g4ffJmTUHikfM 5NLDV/Amv8+33qmCgF3UDOR15z7JbwoFMqVarYuQREbsOYUwAdy8n7NhQ7Po6tkFdJ+2 QpXs4wk7yIulXvLLpScsjr6TUhSowrE4/22nrddnPYOd7Afn6izWbspFkzoiMLcrG/7C vWlgKZSNBBIBpRuOB5qLb+v4PKyuyac/EQkoCkMvunJnsaFq99W5z1z1u8kueZ5TWyrf IINeqDn52Q0Oj3F0B1FALHgdzIK+GEk6E06X7N0tnpiojt8jFuOEROYUuJmy1EQEBKB5 +zqw== X-Received: by 10.180.189.10 with SMTP id ge10mr21236122wic.47.1390492847469; Thu, 23 Jan 2014 08:00:47 -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 fz5sm16760691wic.11.2014.01.23.08.00.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Jan 2014 08:00:46 -0800 (PST) From: Jean-Jacques Hiblot To: nicolas.ferre@atmel.com, plagnioj@jcrosoft.com, b.brezillon@overkiz.com Subject: [PATCH v3 04/15] ARM: at91: prepare common clk transition for sam9261 SoC Date: Thu, 23 Jan 2014 16:57:08 +0100 Message-Id: <1390492639-7299-5-git-send-email-jjhiblot@traphandler.com> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1390492639-7299-1-git-send-email-jjhiblot@traphandler.com> References: <1390492639-7299-1-git-send-email-jjhiblot@traphandler.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140123_110109_716951_6135E1B7 X-CRM114-Status: UNSURE ( 9.96 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: Jean-Jacques Hiblot , 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.8 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 6a2c869..2c0e940 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 * -------------------------------------------------------------------- */ @@ -262,7 +264,7 @@ static void __init at91sam9261_register_clocks(void) clk_register(&hck0); clk_register(&hck1); } - +#endif /* -------------------------------------------------------------------- * GPIO * -------------------------------------------------------------------- */ @@ -362,6 +364,8 @@ AT91_SOC_START(at91sam9261) .extern_irq = (1 << AT91SAM9261_ID_IRQ0) | (1 << AT91SAM9261_ID_IRQ1) | (1 << AT91SAM9261_ID_IRQ2), .ioremap_registers = at91sam9261_ioremap_registers, +#if defined(CONFIG_OLD_CLK_AT91) .register_clocks = at91sam9261_register_clocks, +#endif .init = at91sam9261_initialize, AT91_SOC_END