diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-06-25 15:34:00 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-06-25 20:26:30 +0200 |
| commit | 6d12e796981254677a30366dd16b0a59bda2d898 (patch) | |
| tree | bfee90fb514db5c72da5a5037e1cfcd93e5dd54f /arch/arm/boot/dts/armada-385-db.dts | |
| parent | 11f9323a48875101bc4de6077155c17aed82cfc8 (diff) | |
| parent | 8dbdb8e704db34085f5978c335c10256b0fb9629 (diff) | |
| download | talos-op-linux-6d12e796981254677a30366dd16b0a59bda2d898.tar.gz talos-op-linux-6d12e796981254677a30366dd16b0a59bda2d898.zip | |
Merge tag 'mvebu-fixes-3.16' of git://git.infradead.org/linux-mvebu into fixes
Merge "mvebu fixes for v3.16" from Jason Cooper:
- mvebu
- Fix broken SoC ID detection
- Select ARM_CPU_SUSPEND for v7
- Remove armada38x compatible string (no users yet)
- kirkwood
- Fix phy-connection-type on GuruPlug board
* tag 'mvebu-fixes-3.16' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: Fix the improper use of the compatible string armada38x using a wildcard
ARM: dts: kirkwood: fix phy-connection-type for Guruplug
ARM: mvebu: select ARM_CPU_SUSPEND for Marvell EBU v7 platforms
ARM: mvebu: Fix broken SoC ID detection
Diffstat (limited to 'arch/arm/boot/dts/armada-385-db.dts')
| -rw-r--r-- | arch/arm/boot/dts/armada-385-db.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-385-db.dts b/arch/arm/boot/dts/armada-385-db.dts index 5bae4731828b..1af886f1e486 100644 --- a/arch/arm/boot/dts/armada-385-db.dts +++ b/arch/arm/boot/dts/armada-385-db.dts @@ -16,7 +16,7 @@ / { model = "Marvell Armada 385 Development Board"; - compatible = "marvell,a385-db", "marvell,armada385", "marvell,armada38x"; + compatible = "marvell,a385-db", "marvell,armada385", "marvell,armada380"; chosen { bootargs = "console=ttyS0,115200 earlyprintk"; |
