diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-12-30 15:43:44 +0300 |
|---|---|---|
| committer | Andrew Lunn <andrew@lunn.ch> | 2015-01-10 20:31:16 +0300 |
| commit | a9e274c42da9213c94e308fae9aa488d3698f86a (patch) | |
| tree | 16f12c347c9405b7cc8b075dbd061476310d486a /arch/arm/boot | |
| parent | ddefbdb4c0df6bcb751971e2395e65daf26abb10 (diff) | |
| download | linux-a9e274c42da9213c94e308fae9aa488d3698f86a.tar.xz | |
ARM: mvebu: fix compatible strings of MBus on Armada 375 and Armada 38x
Due to the special handling of window 13 on Armada 375 and Armada 38x
(similar to Armada XP), the MBus hardware block is *not* compatible
with the one used on Armada 370. Using the Armada 370 compatible
string on Armada 375 and 38x will lead to a non-working device if
window 13 ends up being used.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/armada-375.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-38x.dtsi | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi index 50096d3427eb..126bf7e9e6b4 100644 --- a/arch/arm/boot/dts/armada-375.dtsi +++ b/arch/arm/boot/dts/armada-375.dtsi @@ -63,7 +63,7 @@ }; soc { - compatible = "marvell,armada375-mbus", "marvell,armada370-mbus", "simple-bus"; + compatible = "marvell,armada375-mbus", "simple-bus"; #address-cells = <2>; #size-cells = <1>; controller = <&mbusc>; diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi index 04fe80d101f8..33cad7f7a224 100644 --- a/arch/arm/boot/dts/armada-38x.dtsi +++ b/arch/arm/boot/dts/armada-38x.dtsi @@ -31,8 +31,7 @@ }; soc { - compatible = "marvell,armada380-mbus", "marvell,armada370-mbus", - "simple-bus"; + compatible = "marvell,armada380-mbus", "simple-bus"; #address-cells = <2>; #size-cells = <1>; controller = <&mbusc>; |