summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-07-08 17:02:31 +0200
committerGregory CLEMENT <gregory.clement@free-electrons.com>2015-07-25 17:16:47 +0200
commita101b53d3af16255c0038aad26902be590a96ffa (patch)
treeba908342b1e2da3ea79207e959921f7f177f3a6b
parent01049a5deb1d6b9fc3f2df512af09fddd0db6730 (diff)
downloadlinux-stable-a101b53d3af16255c0038aad26902be590a96ffa.tar.gz
linux-stable-a101b53d3af16255c0038aad26902be590a96ffa.tar.bz2
linux-stable-a101b53d3af16255c0038aad26902be590a96ffa.zip
ARM: mvebu: do not check machine in mvebu_pm_init()
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>
-rw-r--r--arch/arm/mach-mvebu/pm.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-mvebu/pm.c b/arch/arm/mach-mvebu/pm.c
index 6573a8f11f70..eca650b4efc8 100644
--- a/arch/arm/mach-mvebu/pm.c
+++ b/arch/arm/mach-mvebu/pm.c
@@ -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)