mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Boris BREZILLON <boris.brezillon@free-electrons.com>
To: Nicolas Ferre <nicolas.ferre@atmel.com>,
	Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
	Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Boris BREZILLON <boris.brezillon@free-electrons.com>
Subject: [PATCH 1/4] ARM: at91: prepare common clk transition for sam9x5 SoCs
Date: Mon, 14 Apr 2014 10:43:11 +0200	[thread overview]
Message-ID: <1397464994-27267-2-git-send-email-boris.brezillon@free-electrons.com> (raw)
In-Reply-To: <1397464994-27267-1-git-send-email-boris.brezillon@free-electrons.com>

This patch encloses sam9x5 old clk registration in
"#if defined(CONFIG_OLD_CLK_AT91) #endif" sections.

Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
---
 arch/arm/mach-at91/at91sam9x5.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-at91/at91sam9x5.c b/arch/arm/mach-at91/at91sam9x5.c
index 9ad781d..e994edd 100644
--- a/arch/arm/mach-at91/at91sam9x5.c
+++ b/arch/arm/mach-at91/at91sam9x5.c
@@ -19,9 +19,10 @@
 #include "board.h"
 #include "soc.h"
 #include "generic.h"
-#include "clock.h"
 #include "sam9_smc.h"
 
+#if defined(CONFIG_OLD_CLK_AT91)
+#include "clock.h"
 /* --------------------------------------------------------------------
  *  Clocks
  * -------------------------------------------------------------------- */
@@ -313,6 +314,7 @@ static void __init at91sam9x5_register_clocks(void)
 	clk_register(&pck0);
 	clk_register(&pck1);
 }
+#endif
 
 /* --------------------------------------------------------------------
  *  AT91SAM9x5 processor initialization
@@ -334,6 +336,8 @@ static void __init at91sam9x5_initialize(void)
 
 AT91_SOC_START(at91sam9x5)
 	.map_io = at91sam9x5_map_io,
+#if defined(CONFIG_OLD_CLK_AT91)
 	.register_clocks = at91sam9x5_register_clocks,
+#endif
 	.init = at91sam9x5_initialize,
 AT91_SOC_END
-- 
1.8.3.2


  reply	other threads:[~2014-04-14  8:43 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-14  8:43 [PATCH 0/4] ARM: at91: move sam9x5 SoCs and boards to the CCF Boris BREZILLON
2014-04-14  8:43 ` Boris BREZILLON [this message]
2014-04-14  8:59   ` [PATCH 1/4] ARM: at91: prepare common clk transition for sam9x5 SoCs Alexandre Belloni
2014-04-14  8:43 ` [PATCH 2/4] ARM: at91/dt: define sam9x5 clocks Boris BREZILLON
2014-04-14  9:08   ` Alexandre Belloni
2014-04-17 14:55   ` Alexandre Belloni
2014-04-17 15:16     ` Boris BREZILLON
2014-04-14  8:43 ` [PATCH 3/4] ARM: at91/dt: define sam9x5ek's crystal frequencies Boris BREZILLON
2014-04-14  9:09   ` Alexandre Belloni
2014-04-14  8:43 ` [PATCH 4/4] ARM: at91: move sam9x5 SoCs to the CCF Boris BREZILLON
2014-04-14  9:10   ` Alexandre Belloni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1397464994-27267-2-git-send-email-boris.brezillon@free-electrons.com \
    --to=boris.brezillon@free-electrons.com \
    --cc=alexandre.belloni@free-electrons.com \
    --cc=devicetree@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nicolas.ferre@atmel.com \
    --cc=plagnioj@jcrosoft.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®