Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f22deee5 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD
Browse files

ARM: at91: make shutdown controler soc independent 



Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent f466f3bc

arch/arm/mach-at91/at91cap9.c

+1 −9
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
 */



#include <linux/module.h>

#include <linux/pm.h>



#include <asm/irq.h>

#include <asm/mach/arch.h>
@@ -23,7 +22,6 @@ 
#include <mach/at91cap9.h>

#include <mach/at91_pmc.h>

#include <mach/at91_rstc.h>

#include <mach/at91_shdwc.h>



#include "soc.h"

#include "generic.h"
@@ -319,12 +317,6 @@ static void at91cap9_reset(void) 
	at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);

}



static void at91cap9_poweroff(void)

{

	at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);

}





/* --------------------------------------------------------------------

 *  AT91CAP9 processor initialization

 * -------------------------------------------------------------------- */
@@ -336,6 +328,7 @@ static void __init at91cap9_map_io(void) 


static void __init at91cap9_ioremap_registers(void)

{

	at91_ioremap_shdwc(AT91CAP9_BASE_SHDWC);

	at91sam926x_ioremap_pit(AT91CAP9_BASE_PIT);

	at91sam9_ioremap_smc(0, AT91CAP9_BASE_SMC);

}
@@ -343,7 +336,6 @@ static void __init at91cap9_ioremap_registers(void) 
static void __init at91cap9_initialize(void)

{

	at91_arch_reset = at91cap9_reset;

	pm_power_off = at91cap9_poweroff;

	at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1);



	/* Register GPIO subsystem */

arch/arm/mach-at91/at91sam9260.c

+1 −9
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
 */



#include <linux/module.h>

#include <linux/pm.h>



#include <asm/irq.h>

#include <asm/mach/arch.h>
@@ -21,7 +20,6 @@ 
#include <mach/at91sam9260.h>

#include <mach/at91_pmc.h>

#include <mach/at91_rstc.h>

#include <mach/at91_shdwc.h>



#include "soc.h"

#include "generic.h"
@@ -287,12 +285,6 @@ static struct at91_gpio_bank at91sam9260_gpio[] = { 
	}

};



static void at91sam9260_poweroff(void)

{

	at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);

}





/* --------------------------------------------------------------------

 *  AT91SAM9260 processor initialization

 * -------------------------------------------------------------------- */
@@ -328,6 +320,7 @@ static void __init at91sam9260_map_io(void) 


static void __init at91sam9260_ioremap_registers(void)

{

	at91_ioremap_shdwc(AT91SAM9260_BASE_SHDWC);

	at91sam926x_ioremap_pit(AT91SAM9260_BASE_PIT);

	at91sam9_ioremap_smc(0, AT91SAM9260_BASE_SMC);

}
@@ -335,7 +328,6 @@ static void __init at91sam9260_ioremap_registers(void) 
static void __init at91sam9260_initialize(void)

{

	at91_arch_reset = at91sam9_alt_reset;

	pm_power_off = at91sam9260_poweroff;

	at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1)

			| (1 << AT91SAM9260_ID_IRQ2);

arch/arm/mach-at91/at91sam9261.c

+1 −9
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
 */



#include <linux/module.h>

#include <linux/pm.h>



#include <asm/irq.h>

#include <asm/mach/arch.h>
@@ -20,7 +19,6 @@ 
#include <mach/at91sam9261.h>

#include <mach/at91_pmc.h>

#include <mach/at91_rstc.h>

#include <mach/at91_shdwc.h>



#include "soc.h"

#include "generic.h"
@@ -268,12 +266,6 @@ static struct at91_gpio_bank at91sam9261_gpio[] = { 
	}

};



static void at91sam9261_poweroff(void)

{

	at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);

}





/* --------------------------------------------------------------------

 *  AT91SAM9261 processor initialization

 * -------------------------------------------------------------------- */
@@ -288,6 +280,7 @@ static void __init at91sam9261_map_io(void) 


static void __init at91sam9261_ioremap_registers(void)

{

	at91_ioremap_shdwc(AT91SAM9261_BASE_SHDWC);

	at91sam926x_ioremap_pit(AT91SAM9261_BASE_PIT);

	at91sam9_ioremap_smc(0, AT91SAM9261_BASE_SMC);

}
@@ -295,7 +288,6 @@ static void __init at91sam9261_ioremap_registers(void) 
static void __init at91sam9261_initialize(void)

{

	at91_arch_reset = at91sam9_alt_reset;

	pm_power_off = at91sam9261_poweroff;

	at91_extern_irq = (1 << AT91SAM9261_ID_IRQ0) | (1 << AT91SAM9261_ID_IRQ1)

			| (1 << AT91SAM9261_ID_IRQ2);

arch/arm/mach-at91/at91sam9263.c

+1 −9
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
 */



#include <linux/module.h>

#include <linux/pm.h>



#include <asm/irq.h>

#include <asm/mach/arch.h>
@@ -19,7 +18,6 @@ 
#include <mach/at91sam9263.h>

#include <mach/at91_pmc.h>

#include <mach/at91_rstc.h>

#include <mach/at91_shdwc.h>



#include "soc.h"

#include "generic.h"
@@ -288,12 +286,6 @@ static struct at91_gpio_bank at91sam9263_gpio[] = { 
	}

};



static void at91sam9263_poweroff(void)

{

	at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);

}





/* --------------------------------------------------------------------

 *  AT91SAM9263 processor initialization

 * -------------------------------------------------------------------- */
@@ -306,6 +298,7 @@ static void __init at91sam9263_map_io(void) 


static void __init at91sam9263_ioremap_registers(void)

{

	at91_ioremap_shdwc(AT91SAM9263_BASE_SHDWC);

	at91sam926x_ioremap_pit(AT91SAM9263_BASE_PIT);

	at91sam9_ioremap_smc(0, AT91SAM9263_BASE_SMC0);

	at91sam9_ioremap_smc(1, AT91SAM9263_BASE_SMC1);
@@ -314,7 +307,6 @@ static void __init at91sam9263_ioremap_registers(void) 
static void __init at91sam9263_initialize(void)

{

	at91_arch_reset = at91sam9_alt_reset;

	pm_power_off = at91sam9263_poweroff;

	at91_extern_irq = (1 << AT91SAM9263_ID_IRQ0) | (1 << AT91SAM9263_ID_IRQ1);



	/* Register GPIO subsystem */

arch/arm/mach-at91/at91sam9g45.c

+1 −9
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
 */



#include <linux/module.h>

#include <linux/pm.h>

#include <linux/dma-mapping.h>



#include <asm/irq.h>
@@ -20,7 +19,6 @@ 
#include <mach/at91sam9g45.h>

#include <mach/at91_pmc.h>

#include <mach/at91_rstc.h>

#include <mach/at91_shdwc.h>

#include <mach/cpu.h>



#include "soc.h"
@@ -323,12 +321,6 @@ static void at91sam9g45_reset(void) 
	at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);

}



static void at91sam9g45_poweroff(void)

{

	at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);

}





/* --------------------------------------------------------------------

 *  AT91SAM9G45 processor initialization

 * -------------------------------------------------------------------- */
@@ -341,6 +333,7 @@ static void __init at91sam9g45_map_io(void) 


static void __init at91sam9g45_ioremap_registers(void)

{

	at91_ioremap_shdwc(AT91SAM9G45_BASE_SHDWC);

	at91sam926x_ioremap_pit(AT91SAM9G45_BASE_PIT);

	at91sam9_ioremap_smc(0, AT91SAM9G45_BASE_SMC);

}
@@ -348,7 +341,6 @@ static void __init at91sam9g45_ioremap_registers(void) 
static void __init at91sam9g45_initialize(void)

{

	at91_arch_reset = at91sam9g45_reset;

	pm_power_off = at91sam9g45_poweroff;

	at91_extern_irq = (1 << AT91SAM9G45_ID_IRQ0);



	/* Register GPIO subsystem */