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

Commit 0d781716 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Nicolas Ferre
Browse files

ARM: at91: factorise duplicated at91sam9 idle 



Remove duplicated at91sam9xxxx_idle() functions introduced
by commit c9dfafba "ARM: mach-at91: move special idle code out of line".
Replace by a generic at91sam9_idle() function in setup.c common
location.

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

arch/arm/mach-at91/at91sam9260.c

+1 −7
Original line number Diff line number Diff line
@@ -329,15 +329,9 @@ static void __init at91sam9260_ioremap_registers(void) 
	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)

{

	arm_pm_idle = at91sam9260_idle;

	arm_pm_idle = at91sam9_idle;

	arm_pm_restart = at91sam9_alt_restart;

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

			| (1 << AT91SAM9260_ID_IRQ2);

arch/arm/mach-at91/at91sam9261.c

+1 −7
Original line number Diff line number Diff line
@@ -287,15 +287,9 @@ static void __init at91sam9261_ioremap_registers(void) 
	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)

{

	arm_pm_idle = at91sam9261_idle;

	arm_pm_idle = at91sam9_idle;

	arm_pm_restart = at91sam9_alt_restart;

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

			| (1 << AT91SAM9261_ID_IRQ2);

arch/arm/mach-at91/at91sam9263.c

+1 −7
Original line number Diff line number Diff line
@@ -308,15 +308,9 @@ static void __init at91sam9263_ioremap_registers(void) 
	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)

{

	arm_pm_idle = at91sam9263_idle;

	arm_pm_idle = at91sam9_idle;

	arm_pm_restart = at91sam9_alt_restart;

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

arch/arm/mach-at91/at91sam9g45.c

+1 −7
Original line number Diff line number Diff line
@@ -317,12 +317,6 @@ static struct at91_gpio_bank at91sam9g45_gpio[] __initdata = { 
	}

};



static void at91sam9g45_idle(void)

{

	at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK);

	cpu_do_idle();

}



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

 *  AT91SAM9G45 processor initialization

 * -------------------------------------------------------------------- */
@@ -343,7 +337,7 @@ static void __init at91sam9g45_ioremap_registers(void) 


static void __init at91sam9g45_initialize(void)

{

	arm_pm_idle = at91sam9g45_idle;

	arm_pm_idle = at91sam9_idle;

	arm_pm_restart = at91sam9g45_restart;

	at91_extern_irq = (1 << AT91SAM9G45_ID_IRQ0);

arch/arm/mach-at91/at91sam9rl.c

+1 −7
Original line number Diff line number Diff line
@@ -292,15 +292,9 @@ static void __init at91sam9rl_ioremap_registers(void) 
	at91sam9_ioremap_smc(0, AT91SAM9RL_BASE_SMC);

}



static void at91sam9rl_idle(void)

{

	at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK);

	cpu_do_idle();

}



static void __init at91sam9rl_initialize(void)

{

	arm_pm_idle = at91sam9rl_idle;

	arm_pm_idle = at91sam9_idle;

	arm_pm_restart = at91sam9_alt_restart;

	at91_extern_irq = (1 << AT91SAM9RL_ID_IRQ0);