* [PATCH v2 5/6] ARM: shmobile: ape6evm: disable legacy clock initialization
@ 2014-11-20 16:21 Ulrich Hecht
0 siblings, 0 replies; only message in thread
From: Ulrich Hecht @ 2014-11-20 16:21 UTC (permalink / raw)
To: linux-sh
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-11-20 16:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-20 16:21 [PATCH v2 5/6] ARM: shmobile: ape6evm: disable legacy clock initialization Ulrich Hecht
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).