]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ARM: mvebu: do not check machine in mvebu_pm_init()
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Wed, 8 Jul 2015 15:02:31 +0000 (17:02 +0200)
committerGregory CLEMENT <gregory.clement@free-electrons.com>
Sat, 25 Jul 2015 15:16:47 +0000 (17:16 +0200)
The mvebu_pm_init() initializes the support for suspend/resume, and
before doing that, it checks if we are on a board on which
suspend/resume is actually supported. However, this check is already
done by mvebu_armada_xp_gp_pm_init(), and there is no need to
duplicate the check: callers of mvebu_pm_init() should now what they
are doing.

This commit is done in preparation to the addition of suspend/resume
support on Armada 38x.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
arch/arm/mach-mvebu/pm.c

index 6573a8f11f70af483ec86325f52e127221ad0cb5..eca650b4efc84d7aedca01145635a0aae83c9444 100644 (file)
@@ -182,9 +182,6 @@ int mvebu_pm_init(void (*board_pm_enter)(void __iomem *sdram_reg, u32 srcmd))
        struct device_node *np;
        struct resource res;
 
-       if (!of_machine_is_compatible("marvell,armadaxp"))
-               return -ENODEV;
-
        np = of_find_compatible_node(NULL, NULL,
                                     "marvell,armada-xp-sdram-controller");
        if (!np)