| From db347f1a5304d68c68c52f19971924b1e5842f3c Mon Sep 17 00:00:00 2001 |
| From: Marcin Wojtas <mw@semihalf.com> |
| Date: Thu, 15 Oct 2015 03:17:08 +0200 |
| Subject: ARM: mvebu: correct a385-db-ap compatible string |
| |
| From: Marcin Wojtas <mw@semihalf.com> |
| |
| commit db347f1a5304d68c68c52f19971924b1e5842f3c upstream. |
| |
| This commit enables standby support on Armada 385 DB-AP board, because |
| the PM initalization routine requires "marvell,armada380" compatible |
| string for all Armada 38x-based platforms. |
| |
| Beside the compatible "marvell,armada38x" was wrong and should be fixed |
| in the stable kernels too. |
| |
| [gregory.clement@free-electrons.com: add information, about the fixes] |
| Fixes: e5ee12817e9ea ("ARM: mvebu: Add Armada 385 Access Point |
| Development Board support") |
| Signed-off-by: Marcin Wojtas <mw@semihalf.com> |
| Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arm/boot/dts/armada-385-db-ap.dts | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/arm/boot/dts/armada-385-db-ap.dts |
| +++ b/arch/arm/boot/dts/armada-385-db-ap.dts |
| @@ -46,7 +46,7 @@ |
| |
| / { |
| model = "Marvell Armada 385 Access Point Development Board"; |
| - compatible = "marvell,a385-db-ap", "marvell,armada385", "marvell,armada38x"; |
| + compatible = "marvell,a385-db-ap", "marvell,armada385", "marvell,armada380"; |
| |
| chosen { |
| stdout-path = "serial1:115200n8"; |
