From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
To: linux-sh@vger.kernel.org
Subject: [PATCH v2 5/6] ARM: shmobile: ape6evm: disable legacy clock initialization
Date: Thu, 20 Nov 2014 16:21:35 +0000 [thread overview]
Message-ID: <1416500496-21024-6-git-send-email-ulrich.hecht+renesas@gmail.com> (raw)
Disables r8a73a4_clock_init() if CCF is enabled.
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
arch/arm/mach-shmobile/board-ape6evm-reference.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/board-ape6evm-reference.c b/arch/arm/mach-shmobile/board-ape6evm-reference.c
index 3b68370..dd5bc63 100644
--- a/arch/arm/mach-shmobile/board-ape6evm-reference.c
+++ b/arch/arm/mach-shmobile/board-ape6evm-reference.c
@@ -29,7 +29,7 @@
static void __init ape6evm_add_standard_devices(void)
{
-
+#ifndef CONFIG_COMMON_CLK
struct clk *parent;
struct clk *mp;
@@ -43,6 +43,7 @@ static void __init ape6evm_add_standard_devices(void)
clk_set_parent(mp, parent);
clk_put(parent);
clk_put(mp);
+#endif
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
--
1.8.4.5
reply other threads:[~2014-11-20 16:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1416500496-21024-6-git-send-email-ulrich.hecht+renesas@gmail.com \
--to=ulrich.hecht+renesas@gmail.com \
--cc=linux-sh@vger.kernel.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).