From: takasi-y@ops.dti.ne.jp
To: SH-Linux <linux-sh@vger.kernel.org>
Cc: Magnus Damm <magnus.damm@gmail.com>,
ben.dooks@codethink.co.uk,
Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com>,
Mike Turquette <mturquette@linaro.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
devicetree@vger.kernel.org, Simon Horman <horms@verge.net.au>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 3/3] ARM: shmobile: kzm9d: Use common clock framework
Date: Tue, 8 Oct 2013 14:34:03 +0900 [thread overview]
Message-ID: <20131008143403.c11f294c8a1701a2ab3bc5fd@ops.dti.ne.jp> (raw)
In-Reply-To: <20131008143040.52f36df8edb7ab63224d8433@ops.dti.ne.jp>
Use common clock framework version of clock
drivers/clk/shmobile/clk-emev2.c
instead of sh-clkfwk version
arch/arm/mach-shmobile/clock-emev2.c
when it is configured as a part of multi-platform.
Signed-off-by: Takashi Yoshii <takasi-y@ops.dti.ne.jp>
---
arch/arm/mach-shmobile/board-kzm9d-reference.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-kzm9d-reference.c b/arch/arm/mach-shmobile/board-kzm9d-reference.c
index 054d8d5..853003c 100644
--- a/arch/arm/mach-shmobile/board-kzm9d-reference.c
+++ b/arch/arm/mach-shmobile/board-kzm9d-reference.c
@@ -20,15 +20,14 @@
#include <linux/init.h>
#include <linux/of_platform.h>
+#include <linux/clk-provider.h>
#include <mach/emev2.h>
#include <mach/common.h>
#include <asm/mach/arch.h>
static void __init kzm9d_add_standard_devices(void)
{
- if (!IS_ENABLED(CONFIG_COMMON_CLK))
- emev2_clock_init();
-
+ of_clk_init(NULL);
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
--
1.8.1.5
next prev parent reply other threads:[~2013-10-08 5:35 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-08 5:30 [PATCH v2 0/3] ARM: shmobile: kzm9d: migrate to common clock framework with DT takasi-y
2013-10-08 5:32 ` [PATCH v2 1/3] clk: emev2: Add support for emev2 SMU clocks " takasi-y
2013-10-08 5:58 ` Magnus Damm
2013-10-09 3:38 ` Simon Horman
2013-10-09 6:10 ` Ben Dooks
2013-10-08 5:33 ` [PATCH v2 2/3] ARM: shmobile: emev2: Add clock tree description in DT takasi-y
2013-10-08 5:54 ` Magnus Damm
2013-10-09 3:40 ` Simon Horman
2013-10-08 5:34 ` takasi-y [this message]
2013-10-08 5:52 ` [PATCH v2 3/3] ARM: shmobile: kzm9d: Use common clock framework Magnus Damm
2013-10-09 3:40 ` Simon Horman
2013-10-09 4:59 ` Magnus Damm
2013-10-09 6:54 ` Simon Horman
2013-10-09 7:29 ` Magnus Damm
2013-10-09 10:39 ` Simon Horman
2013-10-29 4:42 ` Simon Horman
2013-12-02 2:25 ` Simon Horman
2013-12-23 6:41 ` Mike Turquette
2013-12-23 8:00 ` Simon Horman
2014-01-06 8:10 ` 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=20131008143403.c11f294c8a1701a2ab3bc5fd@ops.dti.ne.jp \
--to=takasi-y@ops.dti.ne.jp \
--cc=ben.dooks@codethink.co.uk \
--cc=devicetree@vger.kernel.org \
--cc=horms@verge.net.au \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@gmail.com \
--cc=mturquette@linaro.org \
--cc=shinya.kuribayashi.px@renesas.com \
/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
all inboxes | Powered by JetHome®