From: geert+renesas@glider.be (Geert Uytterhoeven)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/9] ARM: shmobile: ape6evm: Disable legacy clock initialization
Date: Tue, 20 Jan 2015 13:51:40 +0100 [thread overview]
Message-ID: <1421758306-24838-4-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1421758306-24838-1-git-send-email-geert+renesas@glider.be>
From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Disables r8a73a4_clock_init() if CCF is enabled.
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
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 3b68370b03a09ad1..dd5bc63aba421df2 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.9.1
next prev parent reply other threads:[~2015-01-20 12:51 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-20 12:51 [PATCH 0/9] ARM: shmobile: r8a73a4/ape6evm multiplatform Geert Uytterhoeven
2015-01-20 12:51 ` [PATCH 1/9] ARM: shmobile: r8a73a4: Add CPG register bits header Geert Uytterhoeven
2015-01-20 12:51 ` [PATCH 2/9] ARM: shmobile: r8a73a4: Common clock framework DT description Geert Uytterhoeven
2015-01-20 12:51 ` Geert Uytterhoeven [this message]
2015-01-20 12:51 ` [PATCH 4/9] ARM: shmobile: r8a73a4: Add MSTP clock assignments to DT Geert Uytterhoeven
2015-01-20 12:51 ` [PATCH 5/9] ARM: shmobile: r8a73a4 dtsi: Add Bus State Controller node Geert Uytterhoeven
2015-01-20 13:04 ` Laurent Pinchart
2015-01-20 12:51 ` [PATCH 6/9] ARM: shmobile: ape6evm dts: Move Ethernet node to BSC Geert Uytterhoeven
2015-01-20 13:01 ` Laurent Pinchart
2015-01-20 12:51 ` [PATCH 7/9] ARM: shmobile: ape6evm-reference: Remove board C code and DT file Geert Uytterhoeven
2015-01-20 12:51 ` [PATCH 8/9] ARM: shmobile: r8a73a4: ape6evm: Remove legacy platform Geert Uytterhoeven
2015-01-20 12:51 ` [PATCH 9/9] ARM: shmobile: r8a73a4: Remove legacy code Geert Uytterhoeven
2015-01-21 1:59 ` [PATCH 0/9] ARM: shmobile: r8a73a4/ape6evm multiplatform Simon Horman
2015-01-22 3:39 ` Simon Horman
2015-01-23 4:23 ` Simon Horman
2015-01-23 10:00 ` Geert Uytterhoeven
2015-01-23 12:26 ` Laurent Pinchart
2015-01-23 12:41 ` Geert Uytterhoeven
2015-01-24 7:55 ` Simon Horman
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=1421758306-24838-4-git-send-email-geert+renesas@glider.be \
--to=geert+renesas@glider.be \
--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).