From: Michael Walle <michael@walle.cc>
To: linux-arm-kernel@lists.infradead.org
Cc: Grant Likely <grant.likely@secretlab.ca>,
devicetree-discuss@lists.ozlabs.org,
Michael Walle <michael@walle.cc>,
Jason Cooper <jason@lakedaemon.net>
Subject: [PATCH 2/3] ARM: kirkwood: use devicetree for orion-spi
Date: Sun, 3 Jun 2012 22:17:57 +0200 [thread overview]
Message-ID: <1338754678-17000-2-git-send-email-michael@walle.cc> (raw)
In-Reply-To: <1338754678-17000-1-git-send-email-michael@walle.cc>
Populate the devices with auxdata to set the device names which are used by
clkdev to lookup the clocks.
Signed-off-by: Michael Walle <michael@walle.cc>
---
arch/arm/boot/dts/kirkwood.dtsi | 9 +++++++++
arch/arm/mach-kirkwood/board-dt.c | 8 +++++++-
2 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 926528b..46223b3 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -33,6 +33,15 @@
interrupts = <53>;
};
+ spi@10600 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ cell-index = <0>;
+ compatible = "mrvl,orion-spi";
+ reg = <0x10600 0x28>;
+ status = "disabled";
+ };
+
nand@3000000 {
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index edc3f8a..cf1e141 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -25,6 +25,11 @@ static struct of_device_id kirkwood_dt_match_table[] __initdata = {
{ }
};
+struct of_dev_auxdata kirkwood_auxdata_lookup[] __initdata = {
+ OF_DEV_AUXDATA("mrvl,orion-spi", 0xf1010600, "orion_spi.0", NULL),
+ {}
+};
+
static void __init kirkwood_dt_init(void)
{
pr_info("Kirkwood: %s, TCLK=%d.\n", kirkwood_id(), kirkwood_tclk);
@@ -68,7 +73,8 @@ static void __init kirkwood_dt_init(void)
if (of_machine_is_compatible("raidsonic,ib-nas62x0"))
ib62x0_init();
- of_platform_populate(NULL, kirkwood_dt_match_table, NULL, NULL);
+ of_platform_populate(NULL, kirkwood_dt_match_table,
+ kirkwood_auxdata_lookup, NULL);
}
static const char *kirkwood_dt_board_compat[] = {
--
1.7.2.5
next prev parent reply other threads:[~2012-06-03 20:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-03 20:17 [PATCH 1/3] spi-orion: add device tree binding Michael Walle
2012-06-03 20:17 ` Michael Walle [this message]
2012-06-03 20:17 ` [PATCH 3/3] ARM: kirkwood: use devicetree for SPI on dreamplug Michael Walle
2012-06-03 21:01 ` [PATCH 1/3] spi-orion: add device tree binding Jason Cooper
[not found] ` <20120603210123.GL14756-u4khhh1J0LxI1Ri9qeTfzeTW4wlIGRCZ@public.gmane.org>
2012-06-03 21:48 ` Michael Walle
[not found] ` <201206032348.49208.michael-QKn5cuLxLXY@public.gmane.org>
2012-06-07 20:27 ` Jason Cooper
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=1338754678-17000-2-git-send-email-michael@walle.cc \
--to=michael@walle.cc \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=jason@lakedaemon.net \
--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).