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

Commit bec92b1e authored by Russell King's avatar Russell King
Browse files

ARM: restart: iop3xx: use new restart hook 



Hook these platforms restart code into the arm_pm_restart hook rather
than using arch_reset().

In doing so, we split out the n2100 platform specific restart handler
into the n2100 platform file.

Acked-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 6338b66f

arch/arm/include/asm/hardware/iop3xx.h

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ extern int iop3xx_get_init_atu(void); 
void iop3xx_map_io(void);

void iop_init_cp6_handler(void);

void iop_init_time(unsigned long tickrate);

void iop3xx_restart(char, const char *);



static inline u32 read_tmr0(void)

{

arch/arm/mach-iop32x/em7210.c

+1 −0
Original line number Diff line number Diff line
@@ -208,4 +208,5 @@ MACHINE_START(EM7210, "Lanner EM7210") 
	.init_irq	= iop32x_init_irq,

	.timer		= &em7210_timer,

	.init_machine	= em7210_init_machine,

	.restart	= iop3xx_restart,

MACHINE_END

arch/arm/mach-iop32x/glantank.c

+1 −0
Original line number Diff line number Diff line
@@ -212,4 +212,5 @@ MACHINE_START(GLANTANK, "GLAN Tank") 
	.init_irq	= iop32x_init_irq,

	.timer		= &glantank_timer,

	.init_machine	= glantank_init_machine,

	.restart	= iop3xx_restart,

MACHINE_END

arch/arm/mach-iop32x/include/mach/system.h

+0 −15
Original line number Diff line number Diff line
@@ -7,10 +7,6 @@ 
 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#include <asm/mach-types.h>

#include <asm/hardware/iop3xx.h>

#include <mach/n2100.h>



static inline void arch_idle(void)

{

	cpu_do_idle();
@@ -18,15 +14,4 @@ static inline void arch_idle(void) 


static inline void arch_reset(char mode, const char *cmd)

{

	if (machine_is_n2100()) {

		gpio_line_set(N2100_HARDWARE_RESET, GPIO_LOW);

		gpio_line_config(N2100_HARDWARE_RESET, GPIO_OUT);

		while (1)

			;

	}



	*IOP3XX_PCSR = 0x30;



	/* Jump into ROM at address 0 */

	soft_restart(0);

}

arch/arm/mach-iop32x/iq31244.c

+2 −0
Original line number Diff line number Diff line
@@ -318,6 +318,7 @@ MACHINE_START(IQ31244, "Intel IQ31244") 
	.init_irq	= iop32x_init_irq,

	.timer		= &iq31244_timer,

	.init_machine	= iq31244_init_machine,

	.restart	= iop3xx_restart,

MACHINE_END



/* There should have been an ep80219 machine identifier from the beginning.
@@ -332,4 +333,5 @@ MACHINE_START(EP80219, "Intel EP80219") 
	.init_irq	= iop32x_init_irq,

	.timer		= &iq31244_timer,

	.init_machine	= iq31244_init_machine,

	.restart	= iop3xx_restart,

MACHINE_END