aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/at91sam9260.c
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2011-10-31 13:23:20 -0400
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2011-11-28 09:50:38 -0500
commitf22deee523e0ff49c3be01dd6f979d374230725a (patch)
treee8ef85e51335de930cba58e5d7fb90625590002b /arch/arm/mach-at91/at91sam9260.c
parentf466f3bc92eb6857181bb033d14b1e9b1dd52140 (diff)
ARM: at91: make shutdown controler soc independent
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.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.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index fc1f734b80ce..5a17a23724c2 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -11,7 +11,6 @@
11 */ 11 */
12 12
13#include <linux/module.h> 13#include <linux/module.h>
14#include <linux/pm.h>
15 14
16#include <asm/irq.h> 15#include <asm/irq.h>
17#include <asm/mach/arch.h> 16#include <asm/mach/arch.h>
@@ -21,7 +20,6 @@
21#include <mach/at91sam9260.h> 20#include <mach/at91sam9260.h>
22#include <mach/at91_pmc.h> 21#include <mach/at91_pmc.h>
23#include <mach/at91_rstc.h> 22#include <mach/at91_rstc.h>
24#include <mach/at91_shdwc.h>
25 23
26#include "soc.h" 24#include "soc.h"
27#include "generic.h" 25#include "generic.h"
@@ -287,12 +285,6 @@ static struct at91_gpio_bank at91sam9260_gpio[] = {
287 } 285 }
288}; 286};
289 287
290static void at91sam9260_poweroff(void)
291{
292 at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);
293}
294
295
296/* -------------------------------------------------------------------- 288/* --------------------------------------------------------------------
297 * AT91SAM9260 processor initialization 289 * AT91SAM9260 processor initialization
298 * -------------------------------------------------------------------- */ 290 * -------------------------------------------------------------------- */
@@ -328,6 +320,7 @@ static void __init at91sam9260_map_io(void)
328 320
329static void __init at91sam9260_ioremap_registers(void) 321static void __init at91sam9260_ioremap_registers(void)
330{ 322{
323 at91_ioremap_shdwc(AT91SAM9260_BASE_SHDWC);
331 at91sam926x_ioremap_pit(AT91SAM9260_BASE_PIT); 324 at91sam926x_ioremap_pit(AT91SAM9260_BASE_PIT);
332 at91sam9_ioremap_smc(0, AT91SAM9260_BASE_SMC); 325 at91sam9_ioremap_smc(0, AT91SAM9260_BASE_SMC);
333} 326}
@@ -335,7 +328,6 @@ static void __init at91sam9260_ioremap_registers(void)
335static void __init at91sam9260_initialize(void) 328static void __init at91sam9260_initialize(void)
336{ 329{
337 at91_arch_reset = at91sam9_alt_reset; 330 at91_arch_reset = at91sam9_alt_reset;
338 pm_power_off = at91sam9260_poweroff;
339 at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1) 331 at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1)
340 | (1 << AT91SAM9260_ID_IRQ2); 332 | (1 << AT91SAM9260_ID_IRQ2);
341 333