diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 08:09:32 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 08:09:32 +1100 |
| commit | 7043b75a572c0f2558fb7402772379c4f8c29959 (patch) | |
| tree | 104cb238fc36a7a13eff5c9ae2f87f4ea75e6f25 /arch/arm | |
| parent | 9fac39e84e9f1d615c6e581d3bb169c6e9af09c5 (diff) | |
| parent | e8ba6e4b2558a677599157e01f995eb807b4fbcb (diff) | |
Merge remote-tracking branch 'mvebu/for-next'
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/armada-385-linksys.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-xp-98dx4251.dtsi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi index 20d5e8b00f2d..df47bf1ea5eb 100644 --- a/arch/arm/boot/dts/armada-385-linksys.dtsi +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi @@ -107,7 +107,7 @@ status = "okay"; switch@0 { - compatible = "marvell,mv88e6095"; + compatible = "marvell,mv88e6085"; #address-cells = <1>; #size-cells = <0>; reg = <0>; diff --git a/arch/arm/boot/dts/armada-xp-98dx4251.dtsi b/arch/arm/boot/dts/armada-xp-98dx4251.dtsi index 4b0533a4ccb7..b9d9b269efb4 100644 --- a/arch/arm/boot/dts/armada-xp-98dx4251.dtsi +++ b/arch/arm/boot/dts/armada-xp-98dx4251.dtsi @@ -49,7 +49,7 @@ / { model = "Marvell 98DX4251 SoC"; - compatible = "marvell,armadaxp-98dx4521", "marvell,armadaxp-98dx3236", "marvell,armadaxp", "marvell,armada-370-xp"; + compatible = "marvell,armadaxp-98dx4251", "marvell,armadaxp-98dx3236", "marvell,armadaxp", "marvell,armada-370-xp"; cpus { cpu@1 { |