From: sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/6] ARM: dove: Fix tauros2 device tree init
Date: Tue, 25 Sep 2012 02:02:14 +0200 [thread overview]
Message-ID: <1348531338-16624-3-git-send-email-sebastian.hesselbarth@gmail.com> (raw)
In-Reply-To: <1348531338-16624-1-git-send-email-sebastian.hesselbarth@gmail.com>
During the review process of dove DT patches, Tauros2 cache
init call was changed and DT support added. This patch fixes
the call to Tauros2 init and adds a DT node. Moreover, plat/irq.h
include was missing from mach-dove/common.c.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Olof Johansson <olof@lixom.net>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
---
arch/arm/boot/dts/dove.dtsi | 5 +++++
arch/arm/mach-dove/common.c | 3 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 96fb824..3f41f50 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -20,6 +20,11 @@
#address-cells = <1>;
#size-cells = <1>;
+ l2: l2-cache {
+ compatible = "marvell,tauros2-cache";
+ marvell,tauros2-cache-features = <0>;
+ };
+
uart0: serial at 12000 {
compatible = "ns16550a";
reg = <0x12000 0x100>;
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c
index b37bef1..343a4bc 100644
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
@@ -32,6 +32,7 @@
#include <linux/irq.h>
#include <plat/time.h>
#include <linux/platform_data/usb-ehci-orion.h>
+#include <plat/irq.h>
#include <plat/common.h>
#include <plat/addr-map.h>
#include "common.h"
@@ -399,7 +400,7 @@ static void __init dove_dt_init(void)
(dove_tclk + 499999) / 1000000);
#ifdef CONFIG_CACHE_TAUROS2
- tauros2_init();
+ tauros2_init(0);
#endif
dove_setup_cpu_mbus();
--
1.7.10.4
next prev parent reply other threads:[~2012-09-25 0:02 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-25 0:02 [PATCH 0/6] Dove fixes for arm-soc/for-next Sebastian Hesselbarth
2012-09-25 0:02 ` [PATCH 1/6] ARM: dove: Add pcie clock support Sebastian Hesselbarth
2012-09-25 0:02 ` Sebastian Hesselbarth [this message]
2012-09-25 1:22 ` [PATCH 2/6] ARM: dove: Fix tauros2 device tree init Sebastian Hesselbarth
2012-09-25 5:19 ` Andrew Lunn
2012-09-25 8:56 ` Sebastian Hesselbarth
2012-09-25 0:02 ` [PATCH 3/6] ARM: dove: Fix clock names of sata and gbe Sebastian Hesselbarth
2012-09-25 0:02 ` [PATCH 4/6] ARM: dove: Restructure SoC device tree descriptor Sebastian Hesselbarth
2012-09-25 0:02 ` [PATCH 5/6] ARM: dove: Remove watchdog from DT Sebastian Hesselbarth
2012-09-25 5:35 ` Andrew Lunn
2012-09-25 9:11 ` Sebastian Hesselbarth
2012-09-25 9:18 ` Thomas Petazzoni
2012-09-25 9:46 ` Andrew Lunn
2012-09-25 10:14 ` Thomas Petazzoni
2012-09-25 10:31 ` Andrew Lunn
2012-09-25 11:20 ` Arnd Bergmann
2012-09-25 11:48 ` Arnaud Patard (Rtp)
2012-09-25 12:28 ` Arnd Bergmann
2012-10-08 18:40 ` Martin Michlmayr
2012-10-08 19:57 ` Andrew Lunn
2012-10-08 20:10 ` Arnd Bergmann
2012-10-08 20:29 ` Andrew Lunn
2012-09-25 12:33 ` Arnd Bergmann
2012-09-25 18:25 ` sebastien requiem
2012-09-25 20:02 ` Arnd Bergmann
2012-09-25 0:02 ` [PATCH 6/6] ARM: dove: Add crypto engine to DT Sebastian Hesselbarth
2012-09-25 5:37 ` [PATCH 0/6] Dove fixes for arm-soc/for-next Andrew Lunn
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=1348531338-16624-3-git-send-email-sebastian.hesselbarth@gmail.com \
--to=sebastian.hesselbarth@gmail.com \
--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).