Merge pull request #580 from wigyori/cc-libpcap
[15.05/openwrt.git] / target / linux / mvebu / patches-3.18 / 007-fix_the_aurora_l2_cache_node.patch
1 From a9ce1afb35317d2a0646c7530f0ae9822c93cd69 Mon Sep 17 00:00:00 2001
2 From: Gregory CLEMENT <gregory.clement@free-electrons.com>
3 Date: Mon, 6 Oct 2014 11:37:56 +0200
4 Subject: ARM: mvebu: Fix the Aurora L2 cache node with the required
5  cache-unified property
6
7 The L2 cache controller on the Armada 370 and Armada XP SoCs is a
8 unified cache. Moreover, the Aurora cache controller is compatible
9 with the L2x0 cache controller: the "cache-unified" property is
10 required by its binding.
11
12 This patch fixes the Aurora L2 cache node for the Armada 370 and
13 Armada XP SoCs by adding this property.
14
15 Reported-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
16 Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
17 Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
18 Link: https://lkml.kernel.org/r/1412588276-4514-1-git-send-email-gregory.clement@free-electrons.com
19 Signed-off-by: Jason Cooper <jason@lakedaemon.net>
20
21 --- a/arch/arm/boot/dts/armada-370.dtsi
22 +++ b/arch/arm/boot/dts/armada-370.dtsi
23 @@ -95,6 +95,7 @@
24                                 compatible = "marvell,aurora-outer-cache";
25                                 reg = <0x08000 0x1000>;
26                                 cache-id-part = <0x100>;
27 +                               cache-unified;
28                                 wt-override;
29                         };
30  
31 --- a/arch/arm/boot/dts/armada-xp.dtsi
32 +++ b/arch/arm/boot/dts/armada-xp.dtsi
33 @@ -39,6 +39,7 @@
34                                 compatible = "marvell,aurora-system-cache";
35                                 reg = <0x08000 0x1000>;
36                                 cache-id-part = <0x100>;
37 +                               cache-unified;
38                                 wt-override;
39                         };
40