diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-02-17 17:28:29 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-02-17 17:28:29 +0100 |
| commit | a25996e733db057a27a5f90c5636c3e1e01ad33e (patch) | |
| tree | fcc6b7cca3f01afcce08bfa6998a4fcb3dfdbde0 /arch/arm/boot | |
| parent | Merge tag 'omap-for-v4.11/dt-late' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | ARM: dts: armada-385-linksys: fix DSA compatible property (diff) | |
| download | linux-a25996e733db057a27a5f90c5636c3e1e01ad33e.tar.xz linux-a25996e733db057a27a5f90c5636c3e1e01ad33e.zip | |
Merge tag 'mvebu-dt-4.11-4' of git://git.infradead.org/linux-mvebu into next/dt
Pull "mvebu dt for 4.11 (part 4)" from Gregory CLEMENT:
Fix typos introduced during the preparation of the 4.11 merge window.
* tag 'mvebu-dt-4.11-4' of git://git.infradead.org/linux-mvebu:
ARM: dts: armada-385-linksys: fix DSA compatible property
ARM: dts: Fix typo in armada-xp-98dx4251
Diffstat (limited to 'arch/arm/boot')
| -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 { |