From: wsa@the-dreams.de (Wolfram Sang)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V3 05/12] ARM: shmobile: r7s72100: use workaround for non DT-clocks
Date: Fri, 7 Mar 2014 17:00:41 +0100 [thread overview]
Message-ID: <1394208048-32495-6-git-send-email-wsa@the-dreams.de> (raw)
In-Reply-To: <1394208048-32495-1-git-send-email-wsa@the-dreams.de>
From: Wolfram Sang <wsa@sang-engineering.com>
SCIF2 and MTU2 are not yet prepared for DT usage, so use the common
workaround via clkdev for now.
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
---
arch/arm/mach-shmobile/board-genmai-reference.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-genmai-reference.c b/arch/arm/mach-shmobile/board-genmai-reference.c
index 7630c1053e32..91dcdd0e026d 100644
--- a/arch/arm/mach-shmobile/board-genmai-reference.c
+++ b/arch/arm/mach-shmobile/board-genmai-reference.c
@@ -18,18 +18,29 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <linux/clk-provider.h>
#include <linux/kernel.h>
#include <linux/of_platform.h>
+#include <mach/clock.h>
#include <mach/common.h>
#include <mach/r7s72100.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+#ifdef CONFIG_COMMON_CLK
+/*
+ * This is a really crude hack to provide clkdev support to platform
+ * devices until they get moved to DT.
+ */
+static const struct clk_name clk_names[] = {
+ { "mtu2", NULL, "sh_mtu2.0" },
+ { "scif2", NULL, "sh-sci.2" },
+};
+#endif
+
static void __init genmai_add_standard_devices(void)
{
#ifdef CONFIG_COMMON_CLK
- of_clk_init(NULL);
+ shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), true);
#else
r7s72100_clock_init();
#endif
--
1.9.0
next prev parent reply other threads:[~2014-03-07 16:00 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-07 16:00 [PATCH V3 00/12] CCF support for Renesas r7s72100 Wolfram Sang
2014-03-07 16:00 ` [PATCH V3 01/12] clk: shmobile: add CPG driver for rz-platforms Wolfram Sang
2014-03-21 1:26 ` Mike Turquette
2014-03-07 16:00 ` [PATCH V3 02/12] ARM: shmobile: r7s72100: document MSTP clock support Wolfram Sang
2014-03-07 16:00 ` [PATCH V3 03/12] ARM: shmobile: r7s72100: add essential clock nodes to dtsi Wolfram Sang
2014-03-07 16:22 ` Ben Dooks
2014-03-07 16:33 ` Wolfram Sang
2014-03-07 16:00 ` [PATCH V3 04/12] ARM: shmobile: r7s72100: genmai: populate nodes for external clocks Wolfram Sang
2014-03-07 16:00 ` Wolfram Sang [this message]
2014-03-07 16:00 ` [PATCH V3 06/12] ARM: shmobile: r7s72100: add scif nodes to dtsi Wolfram Sang
2014-03-07 16:13 ` Laurent Pinchart
2014-03-07 16:25 ` Wolfram Sang
2014-03-07 16:37 ` Laurent Pinchart
2014-03-07 16:44 ` Wolfram Sang
2014-03-07 16:48 ` Laurent Pinchart
2014-03-07 16:48 ` Wolfram Sang
2014-03-07 16:00 ` [PATCH V3 07/12] ARM: shmobile: r7s72100: genmai: activate scif2 for console output Wolfram Sang
2014-03-07 16:00 ` [PATCH V3 08/12] ARM: shmobile: r7s72100: genmai: platform scif devices only for legacy support Wolfram Sang
2014-03-07 16:00 ` [PATCH V3 09/12] ARM: shmobile: r7s72100: add i2c clocks to dtsi Wolfram Sang
2014-03-07 16:00 ` [PATCH V3 10/12] ARM: shmobile: r7s72100: remove I2C DT clocks from legacy clock support Wolfram Sang
2014-03-07 16:00 ` [PATCH V3 11/12] ARM: shmobile: r7s72100: add spi clocks to dtsi Wolfram Sang
2014-03-07 16:00 ` [PATCH V3 12/12] ARM: shmobile: r7s72100: remove SPI DT clocks from legacy clock support Wolfram Sang
2014-03-07 16:14 ` [PATCH V3 00/12] CCF support for Renesas r7s72100 Laurent Pinchart
2014-03-07 16:29 ` Wolfram Sang
2014-03-07 16:36 ` Laurent Pinchart
2014-03-07 16:47 ` Wolfram Sang
2014-03-07 16:59 ` Laurent Pinchart
2014-03-10 7:27 ` Wolfram Sang
2014-03-10 11:59 ` Laurent Pinchart
2014-03-27 6:46 ` Wolfram Sang
2014-03-27 10:56 ` Laurent Pinchart
2014-03-27 11:36 ` Wolfram Sang
2014-03-27 12:50 ` 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=1394208048-32495-6-git-send-email-wsa@the-dreams.de \
--to=wsa@the-dreams.de \
--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).