OSDN Git Service

ARM: mvebu: adjust Armada XP evaluation board DTS
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thu, 13 Sep 2012 15:41:50 +0000 (17:41 +0200)
committerJason Cooper <jason@lakedaemon.net>
Sat, 22 Sep 2012 14:50:24 +0000 (14:50 +0000)
The Armada XP evaluation board is based on the MV78460 Armava XP
SoC. Now that we have separate .dtsi files for the three different
SoCs of the Armada XP family, use the appropriate one as include for
the Armada XP evaluation board .dts file.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
arch/arm/boot/dts/armada-xp-db.dts

index f97040d..b1fc728 100644 (file)
  */
 
 /dts-v1/;
-/include/ "armada-xp.dtsi"
+/include/ "armada-xp-mv78460.dtsi"
 
 / {
        model = "Marvell Armada XP Evaluation Board";
-       compatible = "marvell,axp-db", "marvell,armadaxp", "marvell,armada-370-xp";
+       compatible = "marvell,axp-db", "marvell,armadaxp-mv78460", "marvell,armadaxp", "marvell,armada-370-xp";
 
        chosen {
                bootargs = "console=ttyS0,115200 earlyprintk";