summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/at91sam9260.c
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2013-10-16 16:24:57 +0200
committerDaniel Lezcano <daniel.lezcano@linaro.org>2013-10-16 23:51:47 +0200
commit6b625891c6b541080bdaad97bcb82bd9ecd9e44b (patch)
tree7964fdc2c15a82e39089276434d56c60926c2365 /arch/arm/mach-at91/at91sam9260.c
parentARM: AT91: pm: Factorize standby function (diff)
downloadlinux-6b625891c6b541080bdaad97bcb82bd9ecd9e44b.tar.xz
linux-6b625891c6b541080bdaad97bcb82bd9ecd9e44b.zip
ARM: AT91: DT: pm: Select ram controller standby based on DT
Move non-dt selection to ioremap_registers init which is only called not non-dt board. So we can support sam9n12/sam9x5/sama5d3 too. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91/at91sam9260.c')
-rw-r--r--arch/arm/mach-at91/at91sam9260.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index 3b43d562d79c..f8629a3fa245 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -343,6 +343,7 @@ static void __init at91sam9260_ioremap_registers(void)
at91sam926x_ioremap_pit(AT91SAM9260_BASE_PIT);
at91sam9_ioremap_smc(0, AT91SAM9260_BASE_SMC);
at91_ioremap_matrix(AT91SAM9260_BASE_MATRIX);
+ at91_pm_set_standby(at91sam9_sdram_standby);
}
static void __init at91sam9260_initialize(void)
@@ -352,8 +353,6 @@ static void __init at91sam9260_initialize(void)
/* Register GPIO subsystem */
at91_gpio_init(at91sam9260_gpio, 3);
-
- at91_pm_set_standby(at91sam9_sdram_standby);
}
/* --------------------------------------------------------------------