From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
To: linux-sh@vger.kernel.org
Subject: [PATCH v2 03/10] ARM: shmobile: sh73a0: common clock framework board support
Date: Tue, 02 Sep 2014 09:12:59 +0000 [thread overview]
Message-ID: <1409649186-1046-4-git-send-email-ulrich.hecht+renesas@gmail.com> (raw)
Adds support for the common clock framework to the KZM9G reference board
and SH73A0 SoC setup code.
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
arch/arm/mach-shmobile/board-kzm9g-reference.c | 25 +++++++++++++++++++++++++
arch/arm/mach-shmobile/setup-sh73a0.c | 5 ++++-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c
index d9cdf9a..19b0842 100644
--- a/arch/arm/mach-shmobile/board-kzm9g-reference.c
+++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
@@ -30,11 +30,36 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+#include "clock.h"
#include "common.h"
#include "sh73a0.h"
+#ifdef CONFIG_COMMON_CLK
+static const struct clk_name clk_names[] __initconst = {
+ { "cmt1", NULL, "sh_cmt.10" },
+ { "scifa0", NULL, "sh-sci.0" },
+ { "scifa1", NULL, "sh-sci.1" },
+ { "scifa2", NULL, "sh-sci.2" },
+ { "scifa3", NULL, "sh-sci.3" },
+ { "scifa4", NULL, "sh-sci.4" },
+ { "scifa5", NULL, "sh-sci.5" },
+ { "scifa6", NULL, "sh-sci.6" },
+ { "scifa7", NULL, "sh-sci.7" },
+ { "scifb", NULL, "sh-sci.8" },
+ { "sdhi0", NULL, "ee100000.sd" },
+ { "sdhi1", NULL, "ee120000.sd" },
+ { "sdhi2", NULL, "ee140000.sd" },
+ { "mmcif0", NULL, "e6bd0000.mmc" },
+ { "iic0", NULL, "e6820000.i2c" },
+ { "iic3", NULL, "e6826000.i2c" },
+};
+#endif
+
static void __init kzm_init(void)
{
+#ifdef CONFIG_COMMON_CLK
+ shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
+#endif
sh73a0_add_standard_devices_dt();
#ifdef CONFIG_CACHE_L2X0
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index 0085305..6d73b83 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -756,7 +756,9 @@ void __init __weak sh73a0_register_twd(void) { }
void __init sh73a0_earlytimer_init(void)
{
sh73a0_init_delay();
+#ifndef CONFIG_COMMON_CLK
sh73a0_clock_init();
+#endif
shmobile_earlytimer_init();
sh73a0_register_twd();
}
@@ -777,8 +779,9 @@ void __init sh73a0_add_early_devices(void)
void __init sh73a0_add_standard_devices_dt(void)
{
/* clocks are setup late during boot in the case of DT */
+#ifndef CONFIG_COMMON_CLK
sh73a0_clock_init();
-
+#endif
platform_add_devices(sh73a0_devices_dt,
ARRAY_SIZE(sh73a0_devices_dt));
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
--
1.8.4.5
next reply other threads:[~2014-09-02 9:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-02 9:12 Ulrich Hecht [this message]
2014-09-04 7:10 ` [PATCH v2 03/10] ARM: shmobile: sh73a0: common clock framework board support Simon Horman
2014-09-04 7:19 ` Geert Uytterhoeven
2014-09-04 7:33 ` Simon Horman
2014-09-09 21:55 ` Laurent Pinchart
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=1409649186-1046-4-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).