summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tango/setup.c
diff options
context:
space:
mode:
authorMarc Gonzalez <marc.w.gonzalez@free.fr>2019-01-16 16:49:58 +0100
committerArnd Bergmann <arnd@arndb.de>2019-01-30 11:45:10 +0100
commitd0f9f16788e15d9eb40f68b047732d49658c5a3a (patch)
tree5523851b802c419eb38cc59116ef9e97b6bbfc8f /arch/arm/mach-tango/setup.c
parenta17bab2d6784630a8ef50f872db7a68b43392f82 (diff)
ARM: tango: Improve ARCH_MULTIPLATFORM compatibility
Calling platform-specific code unconditionally blows up when running an ARCH_MULTIPLATFORM kernel on a different platform. Don't do it. Reported-by: Paolo Pisati <p.pisati@gmail.com> Signed-off-by: Marc Gonzalez <marc.w.gonzalez@free.fr> Acked-by: Pavel Machek <pavel@ucw.cz> Cc: stable@vger.kernel.org # v4.8+ Fixes: a30eceb7a59d ("ARM: tango: add Suspend-to-RAM support") Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-tango/setup.c')
-rw-r--r--arch/arm/mach-tango/setup.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-tango/setup.c b/arch/arm/mach-tango/setup.c
index 677dd7b5efd9..824f90737b04 100644
--- a/arch/arm/mach-tango/setup.c
+++ b/arch/arm/mach-tango/setup.c
@@ -2,6 +2,7 @@
#include <asm/mach/arch.h>
#include <asm/hardware/cache-l2x0.h>
#include "smc.h"
+#include "pm.h"
static void tango_l2c_write(unsigned long val, unsigned int reg)
{
@@ -15,4 +16,5 @@ DT_MACHINE_START(TANGO_DT, "Sigma Tango DT")
.dt_compat = tango_dt_compat,
.l2c_aux_mask = ~0,
.l2c_write_sec = tango_l2c_write,
+ .init_late = tango_pm_init,
MACHINE_END