From: Bastian Hecht <hechtb@gmail.com>
To: linux-sh@vger.kernel.org
Cc: Magnus Damm <magnus.damm@gmail.com>,
Paul Mundt <lethal@linux-sh.org>,
linux-serial@vger.kernel.org
Subject: [PATCH v3 3/3] ARM: mach-shmobile: r8a7740: Setup the serial devices using DT
Date: Tue, 26 Feb 2013 11:03:28 -0600 [thread overview]
Message-ID: <1361898208-6683-3-git-send-email-hechtb+renesas@gmail.com> (raw)
In-Reply-To: <1361898208-6683-1-git-send-email-hechtb+renesas@gmail.com>
We can now use the Device Tree for bringing up our serial devices. We
need to add an alternative early_devices list in setup-r8a7740 without
the serial devices and move them into the Armadillo-reference .dts config file.
Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com>
---
v3:
no changes
.../boot/dts/r8a7740-armadillo800eva-reference.dts | 94 ++++++++++++++++++++
arch/arm/mach-shmobile/setup-r8a7740.c | 15 +++-
2 files changed, 105 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
index 1e339cd..52645b6 100644
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
@@ -134,6 +134,100 @@
renesas,pins = "eth_base";
renesas,function = "eth";
};
+
+ sci@0xe6c40000 {
+ compatible = "renesas,sci-SCIFA-uart";
+ interrupt-parent = <&intca>;
+ reg = <0xe6c40000 0x100>;
+ interrupts = <0x0c00>, <0x0c00>, <0x0c00>, <0x0c00>;
+ cell-index = <0>;
+ renesas,scscr = <0x30>;
+ renesas,scbrr-algo-id = <4>;
+ renesas,autoconf;
+ };
+
+ sci@0xe6c50000 {
+ compatible = "renesas,sci-SCIFA-uart";
+ interrupt-parent = <&intca>;
+ reg = <0xe6c50000 0x100>;
+ interrupts = <0x0c20>, <0x0c20>, <0x0c20>, <0x0c20>;
+ cell-index = <1>;
+ renesas,scscr = <0x30>;
+ renesas,scbrr-algo-id = <4>;
+ renesas,autoconf;
+ };
+
+ sci@0xe6c60000 {
+ compatible = "renesas,sci-SCIFA-uart";
+ interrupt-parent = <&intca>;
+ reg = <0xe6c60000 0x100>;
+ interrupts = <0x0c40>, <0x0c40>, <0x0c40>, <0x0c40>;
+ cell-index = <2>;
+ renesas,scscr = <0x30>;
+ renesas,scbrr-algo-id = <4>;
+ renesas,autoconf;
+ };
+
+ sci@0xe6c70000 {
+ compatible = "renesas,sci-SCIFA-uart";
+ interrupt-parent = <&intca>;
+ reg = <0xe6c70000 0x100>;
+ interrupts = <0x0c60>, <0x0c60>, <0x0c60>, <0x0c60>;
+ cell-index = <3>;
+ renesas,scscr = <0x30>;
+ renesas,scbrr-algo-id = <4>;
+ renesas,autoconf;
+ };
+ sci@0xe6c80000 {
+ compatible = "renesas,sci-SCIFA-uart";
+ interrupt-parent = <&intca>;
+ reg = <0xe6c80000 0x100>;
+ interrupts = <0x0d20>, <0x0d20>, <0x0d20>, <0x0d20>;
+ cell-index = <4>;
+ renesas,scscr = <0x30>;
+ renesas,scbrr-algo-id = <4>;
+ renesas,autoconf;
+ };
+ sci@0xe6cb0000 {
+ compatible = "renesas,sci-SCIFA-uart";
+ interrupt-parent = <&intca>;
+ reg = <0xe6cb0000 0x100>;
+ interrupts = <0x0d40>, <0x0d40>, <0x0d40>, <0x0d40>;
+ cell-index = <5>;
+ renesas,scscr = <0x30>;
+ renesas,scbrr-algo-id = <4>;
+ renesas,autoconf;
+ };
+ sci@0xe6cc0000 {
+ compatible = "renesas,sci-SCIFA-uart";
+ interrupt-parent = <&intca>;
+ reg = <0xe6cc0000 0x100>;
+ interrupts = <0x04c0>, <0x04c0>, <0x04c0>, <0x04c0>;
+ cell-index = <6>;
+ renesas,scscr = <0x30>;
+ renesas,scbrr-algo-id = <4>;
+ renesas,autoconf;
+ };
+ sci@0xe6cd0000 {
+ compatible = "renesas,sci-SCIFA-uart";
+ interrupt-parent = <&intca>;
+ reg = <0xe6cd0000 0x100>;
+ interrupts = <0x04e0>, <0x04e0>, <0x04e0>, <0x04e0>;
+ cell-index = <7>;
+ renesas,scscr = <0x30>;
+ renesas,scbrr-algo-id = <4>;
+ renesas,autoconf;
+ };
+ sci@0xe6c30000 {
+ compatible = "renesas,sci-SCIFB-uart";
+ interrupt-parent = <&intca>;
+ reg = <0xe6c30000 0x100>;
+ interrupts = <0x0d60>, <0x0d60>, <0x0d60>, <0x0d60>;
+ cell-index = <8>;
+ renesas,scscr = <0x30>;
+ renesas,scbrr-algo-id = <4>;
+ renesas,autoconf;
+ };
};
&gpio {
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 5312aad..5f7597a 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -394,6 +394,13 @@ static struct platform_device *r8a7740_early_devices[] __initdata = {
&tmu02_device,
};
+static struct platform_device *r8a7740_early_devices_dt[] __initdata = {
+ &cmt10_device,
+ &tmu00_device,
+ &tmu01_device,
+ &tmu02_device,
+};
+
/* DMA */
static const struct sh_dmae_slave_config r8a7740_dmae_slaves[] = {
{
@@ -839,8 +846,8 @@ void __init r8a7740_add_early_devices_dt(void)
{
shmobile_setup_delay(800, 1, 3); /* Cortex-A9 @ 800MHz */
- early_platform_add_devices(r8a7740_early_devices,
- ARRAY_SIZE(r8a7740_early_devices));
+ early_platform_add_devices(r8a7740_early_devices_dt,
+ ARRAY_SIZE(r8a7740_early_devices_dt));
/* setup early console here as well */
shmobile_setup_console();
@@ -852,8 +859,8 @@ static const struct of_dev_auxdata r8a7740_auxdata_lookup[] __initconst = {
void __init r8a7740_add_standard_devices_dt(void)
{
- platform_add_devices(r8a7740_early_devices,
- ARRAY_SIZE(r8a7740_early_devices));
+ platform_add_devices(r8a7740_early_devices_dt,
+ ARRAY_SIZE(r8a7740_early_devices_dt));
of_platform_populate(NULL, of_default_bus_match_table,
r8a7740_auxdata_lookup, NULL);
--
1.7.9.5
next prev parent reply other threads:[~2013-02-26 16:04 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-26 17:03 [PATCH v3 1/3] serial: sh-sci: Add OF support Bastian Hecht
2013-02-26 17:03 ` [PATCH v3 2/3] ARM: mach-shmobile: r8a7740: Add DT names to clock list Bastian Hecht
2013-03-01 9:42 ` Simon Horman
2013-02-26 17:03 ` Bastian Hecht [this message]
2013-03-01 9:42 ` [PATCH v3 3/3] ARM: mach-shmobile: r8a7740: Setup the serial devices using DT Simon Horman
2013-03-01 16:21 ` Bastian Hecht
2013-03-02 1:31 ` Simon Horman
2013-03-04 12:48 ` Magnus Damm
2013-03-04 13:33 ` Guennadi Liakhovetski
2013-03-05 3:27 ` Simon Horman
2013-03-05 6:52 ` Guennadi Liakhovetski
2013-03-05 7:04 ` Simon Horman
2013-03-04 15:44 ` Bastian Hecht
2013-03-05 3:36 ` Simon Horman
2013-02-27 8:07 ` [PATCH v3 1/3] serial: sh-sci: Add OF support Paul Mundt
2013-02-27 8:11 ` Magnus Damm
2013-02-27 8:19 ` Paul Mundt
2013-02-27 8:26 ` Magnus Damm
2013-02-27 9:04 ` Simon Horman
2013-02-27 9:34 ` Paul Mundt
2013-02-28 19:20 ` Bastian Hecht
2013-03-01 0:50 ` 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=1361898208-6683-3-git-send-email-hechtb+renesas@gmail.com \
--to=hechtb@gmail.com \
--cc=lethal@linux-sh.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@gmail.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;
as well as URLs for NNTP newsgroup(s).