diff options
| author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2012-09-25 02:02:14 +0200 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2012-10-17 17:19:50 +0000 |
| commit | fd57c65cbc26f58b78169b35b2ff25152750339f (patch) | |
| tree | 20bda7aa7d4503ecbf3b0f933578d14e8a0ea130 /arch | |
| parent | 529b89ef7ff898397ff3a44b527816a82d0c699c (diff) | |
| download | linux-3.10-fd57c65cbc26f58b78169b35b2ff25152750339f.tar.gz linux-3.10-fd57c65cbc26f58b78169b35b2ff25152750339f.tar.bz2 linux-3.10-fd57c65cbc26f58b78169b35b2ff25152750339f.zip | |
ARM: dove: Fix tauros2 device tree init
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>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/dove.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/mach-dove/common.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index 96fb824b5e6..3f41f503b75 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@12000 { compatible = "ns16550a"; reg = <0x12000 0x100>; diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c index b37bef1d5ff..343a4bcc6d9 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(); |