diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-30 17:08:56 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-30 17:08:56 (GMT) |
| commit | 5e5d8999a316d596f2012fe1cf4c59e0de693dab (patch) | |
| tree | 56d0aeed586f34e97acbc78759606fddb3ba0627 /arch/arm/boot | |
| parent | 0c0029cb1806601430692d48c130a17302a18225 (diff) | |
| parent | 3ee11aef75db51c69cb8cb91dd01afb28036f1b5 (diff) | |
| download | linux-fsl-qoriq-5e5d8999a316d596f2012fe1cf4c59e0de693dab.tar.xz | |
Merge tag 'mvebu_cache_l2x0_for_3.8' of git://git.infradead.org/users/jcooper/linux into late/mvebu
From Jason Cooper:
mvebu cache-l2x0 for v3.8
- Add support for l2x0 cache on mvebu boards
- Depends on mvebu/everything
* tag 'mvebu_cache_l2x0_for_3.8' of git://git.infradead.org/users/jcooper/linux:
arm: l2x0: add aurora related properties to OF binding
arm: mvebu: add Aurora L2 Cache Controller to the DT
arm: mvebu: add L2 cache support
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/armada-370.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-xp.dtsi | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index 7fbac28..636cf7d 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi @@ -20,6 +20,12 @@ / { model = "Marvell Armada 370 family SoC"; compatible = "marvell,armada370", "marvell,armada-370-xp"; + L2: l2-cache { + compatible = "marvell,aurora-outer-cache"; + reg = <0xd0008000 0x1000>; + cache-id-part = <0x100>; + wt-override; + }; aliases { gpio0 = &gpio0; diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index 45a567c..367aa3f 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi @@ -22,6 +22,13 @@ model = "Marvell Armada XP family SoC"; compatible = "marvell,armadaxp", "marvell,armada-370-xp"; + L2: l2-cache { + compatible = "marvell,aurora-system-cache"; + reg = <0xd0008000 0x1000>; + cache-id-part = <0x100>; + wt-override; + }; + mpic: interrupt-controller@d0020000 { reg = <0xd0020a00 0x1d0>, <0xd0021070 0x58>; |