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

Commit 1b2073e7 authored by Russell King's avatar Russell King
Browse files

ARM: restart: at91: use new restart hook 



Rather than using a private function pointer, use the existing
arm_pm_restart function pointer instead.  We no longer need to enable
the I-cache in at91sam9_alt_reset() as the caches will now be on when
this function is called.

Update the function names to use the 'restart' terminology rather than
the 'reboot' terminology.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 83909188

arch/arm/mach-at91/at91cap9.c

+2 −2
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ static struct at91_gpio_bank at91cap9_gpio[] = { 
	}

};



static void at91cap9_reset(void)

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

{

	at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);

}
@@ -335,7 +335,7 @@ static void __init at91cap9_map_io(void) 


static void __init at91cap9_initialize(void)

{

	at91_arch_reset = at91cap9_reset;

	arm_pm_restart = at91cap9_restart;

	pm_power_off = at91cap9_poweroff;

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

arch/arm/mach-at91/at91rm9200.c

+2 −2
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ static struct at91_gpio_bank at91rm9200_gpio[] = { 
	}

};



static void at91rm9200_reset(void)

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

{

	/*

	 * Perform a hardware reset with the use of the Watchdog timer.
@@ -309,7 +309,7 @@ static void __init at91rm9200_map_io(void) 


static void __init at91rm9200_initialize(void)

{

	at91_arch_reset = at91rm9200_reset;

	arm_pm_restart = at91rm9200_restart;

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

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

			| (1 << AT91RM9200_ID_IRQ4) | (1 << AT91RM9200_ID_IRQ5)

arch/arm/mach-at91/at91sam9260.c

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ static void __init at91sam9260_map_io(void) 


static void __init at91sam9260_initialize(void)

{

	at91_arch_reset = at91sam9_alt_reset;

	arm_pm_restart = at91sam9_alt_restart;

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


static void __init at91sam9261_initialize(void)

{

	at91_arch_reset = at91sam9_alt_reset;

	arm_pm_restart = at91sam9_alt_restart;

	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 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static void __init at91sam9263_map_io(void) 


static void __init at91sam9263_initialize(void)

{

	at91_arch_reset = at91sam9_alt_reset;

	arm_pm_restart = at91sam9_alt_restart;

	pm_power_off = at91sam9263_poweroff;

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