From: linux-arm@overkiz.com (Boris BREZILLON)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/5] ARM: at91: disable specific soc clock init functions
Date: Sat, 12 May 2012 10:53:56 +0200 [thread overview]
Message-ID: <1336812838-3649-4-git-send-email-linux-arm@overkiz.com> (raw)
In-Reply-To: <1336812838-3649-1-git-send-email-linux-arm@overkiz.com>
---
arch/arm/mach-at91/at91sam9260.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index a27bbec..94eae4f 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -25,13 +25,17 @@
#include "soc.h"
#include "generic.h"
+#ifndef CONFIG_COMMON_CLK
#include "clock.h"
+#else
+#include <linux/clk.h>
+#endif
#include "sam9_smc.h"
/* --------------------------------------------------------------------
* Clocks
* -------------------------------------------------------------------- */
-
+#ifndef CONFIG_COMMON_CLK
/*
* The peripheral clocks.
*/
@@ -267,6 +271,7 @@ static void __init at91sam9260_register_clocks(void)
clk_register(&pck0);
clk_register(&pck1);
}
+#endif
/* --------------------------------------------------------------------
* GPIO
@@ -382,6 +387,8 @@ struct at91_init_soc __initdata at91sam9260_soc = {
.map_io = at91sam9260_map_io,
.default_irq_priority = at91sam9260_default_irq_priority,
.ioremap_registers = at91sam9260_ioremap_registers,
+#ifndef CONFIG_COMMON_CLK
.register_clocks = at91sam9260_register_clocks,
+#endif
.init = at91sam9260_initialize,
};
--
1.7.9.5
next prev parent reply other threads:[~2012-05-12 8:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-12 8:53 [PATCH 0/5] ARM: at91: moving at91 to the common clk framework Boris BREZILLON
2012-05-12 8:53 ` [PATCH 1/5] ARM: at91: Add PMC registers definitions Boris BREZILLON
2012-05-12 8:53 ` [PATCH 2/5] ARM: at91: Implementation of PMC clks using the common clk framework Boris BREZILLON
2012-06-12 17:03 ` Mike Turquette
2012-06-14 11:48 ` Boris BREZILLON
2012-05-12 8:53 ` Boris BREZILLON [this message]
2012-05-12 8:53 ` [PATCH 4/5] ARM: at91: add pmc clks definition into device tree Boris BREZILLON
2012-05-12 8:53 ` [PATCH 5/5] ARM: at91: Modify board_dt init sequence Boris BREZILLON
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=1336812838-3649-4-git-send-email-linux-arm@overkiz.com \
--to=linux-arm@overkiz.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).