From: horms+renesas@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 5/8] ARM: shmobile: koelsch-reference: Enable CMT0 in device tree
Date: Thu, 17 Jul 2014 09:40:32 +0900 [thread overview]
Message-ID: <313a57857da567732cfb7f99947b96590e807461.1405556312.git.horms+renesas@verge.net.au> (raw)
In-Reply-To: <cover.1405556312.git.horms+renesas@verge.net.au>
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
No more device needs to be added from platform code when booting the
reference platform, remove the now empty r8a7791_add_dt_devices()
function completely.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791-koelsch.dts | 4 ++++
arch/arm/mach-shmobile/board-koelsch-reference.c | 2 --
arch/arm/mach-shmobile/r8a7791.h | 1 -
arch/arm/mach-shmobile/setup-r8a7791.c | 7 +------
4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index 23486c0..8f36d4f 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -307,6 +307,10 @@
};
};
+&cmt0 {
+ status = "ok";
+};
+
&sata0 {
status = "okay";
};
diff --git a/arch/arm/mach-shmobile/board-koelsch-reference.c b/arch/arm/mach-shmobile/board-koelsch-reference.c
index 3ff88c1..9db5e67 100644
--- a/arch/arm/mach-shmobile/board-koelsch-reference.c
+++ b/arch/arm/mach-shmobile/board-koelsch-reference.c
@@ -88,7 +88,6 @@ static void __init koelsch_add_du_device(void)
* devices until they get moved to DT.
*/
static const struct clk_name clk_names[] __initconst = {
- { "cmt0", "fck", "sh-cmt-48-gen2.0" },
{ "du0", "du.0", "rcar-du-r8a7791" },
{ "du1", "du.1", "rcar-du-r8a7791" },
{ "lvds0", "lvds.0", "rcar-du-r8a7791" },
@@ -97,7 +96,6 @@ static const struct clk_name clk_names[] __initconst = {
static void __init koelsch_add_standard_devices(void)
{
shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
- r8a7791_add_dt_devices();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
koelsch_add_du_device();
diff --git a/arch/arm/mach-shmobile/r8a7791.h b/arch/arm/mach-shmobile/r8a7791.h
index 86eae7b..c1bf7ab 100644
--- a/arch/arm/mach-shmobile/r8a7791.h
+++ b/arch/arm/mach-shmobile/r8a7791.h
@@ -2,7 +2,6 @@
#define __ASM_R8A7791_H__
void r8a7791_add_standard_devices(void);
-void r8a7791_add_dt_devices(void);
void r8a7791_clock_init(void);
void r8a7791_pinmux_init(void);
void r8a7791_pm_init(void);
diff --git a/arch/arm/mach-shmobile/setup-r8a7791.c b/arch/arm/mach-shmobile/setup-r8a7791.c
index 8823324..64cb1d7 100644
--- a/arch/arm/mach-shmobile/setup-r8a7791.c
+++ b/arch/arm/mach-shmobile/setup-r8a7791.c
@@ -182,11 +182,6 @@ static const struct resource thermal_resources[] __initconst = {
thermal_resources, \
ARRAY_SIZE(thermal_resources))
-void __init r8a7791_add_dt_devices(void)
-{
- r8a7791_register_cmt(0);
-}
-
void __init r8a7791_add_standard_devices(void)
{
r8a7791_register_scif(0);
@@ -204,7 +199,7 @@ void __init r8a7791_add_standard_devices(void)
r8a7791_register_scif(12);
r8a7791_register_scif(13);
r8a7791_register_scif(14);
- r8a7791_add_dt_devices();
+ r8a7791_register_cmt(0);
r8a7791_register_irqc(0);
r8a7791_register_thermal();
}
--
2.0.0
next prev parent reply other threads:[~2014-07-17 0:40 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-17 0:40 [GIT PULL] Renesas ARM Based SoC DT Timers Updates for v3.17 Simon Horman
2014-07-17 0:40 ` [PATCH 1/8] ARM: shmobile: r8a7790: Add CMT devices to DT Simon Horman
2014-07-17 0:40 ` [PATCH 2/8] ARM: shmobile: r8a7791: " Simon Horman
2014-07-17 0:40 ` [PATCH 3/8] ARM: shmobile: r8a7779: Add TMU " Simon Horman
2014-07-17 0:40 ` [PATCH 4/8] ARM: shmobile: lager-reference: Enable CMT0 in device tree Simon Horman
2014-07-17 0:40 ` Simon Horman [this message]
2014-07-17 0:40 ` [PATCH 6/8] ARM: shmobile: marzen-reference: Enable TMU0 " Simon Horman
2014-07-17 0:40 ` [PATCH 7/8] ARM: shmobile: r7s72100: Add MTU2 device to DT Simon Horman
2014-07-17 0:40 ` [PATCH 8/8] ARM: shmobile: genmai-reference: Enable MTU2 in device tree Simon Horman
2014-07-19 5:27 ` [GIT PULL] Renesas ARM Based SoC DT Timers Updates for v3.17 Olof Johansson
2014-07-20 13:51 ` Simon Horman
2014-07-23 23:54 ` Simon Horman
2014-07-24 0:00 ` Olof Johansson
2014-07-24 2:05 ` Simon Horman
2014-08-20 0:24 [GIT PULL] Renesas ARM Based SoC DT Timers Updates for v3.18 Simon Horman
2014-08-20 0:24 ` [PATCH 5/8] ARM: shmobile: koelsch-reference: Enable CMT0 in device tree 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=313a57857da567732cfb7f99947b96590e807461.1405556312.git.horms+renesas@verge.net.au \
--to=horms+renesas@verge.net.au \
--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).