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

Commit c9dfafba authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Nicolas Pitre
Browse files

ARM: mach-at91: move special idle code out of line 



... and hook it to arm_pm_idle.

Signed-off-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
parent 8dd67188

arch/arm/mach-at91/at91cap9.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 




#include <linux/module.h>

#include <linux/module.h>





#include <asm/proc-fns.h>

#include <asm/irq.h>

#include <asm/irq.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/map.h>
@@ -314,6 +315,12 @@ static struct at91_gpio_bank at91cap9_gpio[] __initdata = { 
	}

	}

};

};





static void at91cap9_idle(void)

{

	at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK);

	cpu_do_idle();

}



static void at91cap9_restart(char mode, const char *cmd)

static void at91cap9_restart(char mode, const char *cmd)

{

{

	at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);

	at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);
@@ -337,6 +344,7 @@ static void __init at91cap9_ioremap_registers(void) 




static void __init at91cap9_initialize(void)

static void __init at91cap9_initialize(void)

{

{

	arm_pm_idle = at91cap9_idle;

	arm_pm_restart = at91cap9_restart;

	arm_pm_restart = at91cap9_restart;

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

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

arch/arm/mach-at91/at91rm9200.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -289,6 +289,15 @@ static struct at91_gpio_bank at91rm9200_gpio[] __initdata = { 
	}

	}

};

};





static void at91rm9200_idle(void)

{

	/*

	 * Disable the processor clock.  The processor will be automatically

	 * re-enabled by an interrupt or by a reset.

	 */

	at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK);

}



static void at91rm9200_restart(char mode, const char *cmd)

static void at91rm9200_restart(char mode, const char *cmd)

{

{

	/*

	/*
@@ -314,6 +323,7 @@ static void __init at91rm9200_ioremap_registers(void) 




static void __init at91rm9200_initialize(void)

static void __init at91rm9200_initialize(void)

{

{

	arm_pm_idle = at91rm9200_idle;

	arm_pm_restart = at91rm9200_restart;

	arm_pm_restart = at91rm9200_restart;

	at91_extern_irq = (1 << AT91RM9200_ID_IRQ0) | (1 << AT91RM9200_ID_IRQ1)

	at91_extern_irq = (1 << AT91RM9200_ID_IRQ0) | (1 << AT91RM9200_ID_IRQ1)

			| (1 << AT91RM9200_ID_IRQ2) | (1 << AT91RM9200_ID_IRQ3)

			| (1 << AT91RM9200_ID_IRQ2) | (1 << AT91RM9200_ID_IRQ3)

arch/arm/mach-at91/at91sam9260.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ 




#include <linux/module.h>

#include <linux/module.h>





#include <asm/proc-fns.h>

#include <asm/irq.h>

#include <asm/irq.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/map.h>
@@ -327,8 +328,15 @@ static void __init at91sam9260_ioremap_registers(void) 
	at91sam9_ioremap_smc(0, AT91SAM9260_BASE_SMC);

	at91sam9_ioremap_smc(0, AT91SAM9260_BASE_SMC);

}

}





static void at91sam9260_idle(void)

{

	at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK);

	cpu_do_idle();

}



static void __init at91sam9260_initialize(void)

static void __init at91sam9260_initialize(void)

{

{

	arm_pm_idle = at91sam9260_idle;

	arm_pm_restart = at91sam9_alt_restart;

	arm_pm_restart = at91sam9_alt_restart;

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

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

			| (1 << AT91SAM9260_ID_IRQ2);

			| (1 << AT91SAM9260_ID_IRQ2);

arch/arm/mach-at91/at91sam9261.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ 




#include <linux/module.h>

#include <linux/module.h>





#include <asm/proc-fns.h>

#include <asm/irq.h>

#include <asm/irq.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/map.h>
@@ -285,8 +286,15 @@ static void __init at91sam9261_ioremap_registers(void) 
	at91sam9_ioremap_smc(0, AT91SAM9261_BASE_SMC);

	at91sam9_ioremap_smc(0, AT91SAM9261_BASE_SMC);

}

}





static void at91sam9261_idle(void)

{

	at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK);

	cpu_do_idle();

}



static void __init at91sam9261_initialize(void)

static void __init at91sam9261_initialize(void)

{

{

	arm_pm_idle = at91sam9261_idle;

	arm_pm_restart = at91sam9_alt_restart;

	arm_pm_restart = at91sam9_alt_restart;

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

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

			| (1 << AT91SAM9261_ID_IRQ2);

			| (1 << AT91SAM9261_ID_IRQ2);

arch/arm/mach-at91/at91sam9263.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ 




#include <linux/module.h>

#include <linux/module.h>





#include <asm/proc-fns.h>

#include <asm/irq.h>

#include <asm/irq.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/map.h>
@@ -306,8 +307,15 @@ static void __init at91sam9263_ioremap_registers(void) 
	at91sam9_ioremap_smc(1, AT91SAM9263_BASE_SMC1);

	at91sam9_ioremap_smc(1, AT91SAM9263_BASE_SMC1);

}

}





static void at91sam9263_idle(void)

{

	at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK);

	cpu_do_idle();

}



static void __init at91sam9263_initialize(void)

static void __init at91sam9263_initialize(void)

{

{

	arm_pm_idle = at91sam9263_idle;

	arm_pm_restart = at91sam9_alt_restart;

	arm_pm_restart = at91sam9_alt_restart;

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

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