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

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

ARM: restart: cns3xxx: use new restart hook 



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

Acked-by: default avatarAnton Vorontsov <cbouatmailru@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 6c000712

arch/arm/mach-cns3xxx/cns3420vb.c

+1 −0
Original line number Diff line number Diff line
@@ -202,4 +202,5 @@ MACHINE_START(CNS3420VB, "Cavium Networks CNS3420 Validation Board") 
	.init_irq	= cns3xxx_init_irq,

	.timer		= &cns3xxx_timer,

	.init_machine	= cns3420_init,

	.restart	= cns3xxx_restart,

MACHINE_END

arch/arm/mach-cns3xxx/core.h

+1 −0
Original line number Diff line number Diff line
@@ -22,5 +22,6 @@ static inline void cns3xxx_l2x0_init(void) {} 
void __init cns3xxx_map_io(void);

void __init cns3xxx_init_irq(void);

void cns3xxx_power_off(void);

void cns3xxx_restart(char, const char *);



#endif /* __CNS3XXX_CORE_H */

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

+3 −2
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#ifndef __MACH_SYSTEM_H

#define __MACH_SYSTEM_H



#include <linux/io.h>

#include <asm/proc-fns.h>



static inline void arch_idle(void)
@@ -23,6 +22,8 @@ static inline void arch_idle(void) 
	cpu_do_idle();

}



void arch_reset(char mode, const char *cmd);

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

{

}



#endif

arch/arm/mach-cns3xxx/pm.c

+2 −2
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ 
#include <linux/io.h>

#include <linux/delay.h>

#include <linux/atomic.h>

#include <mach/system.h>

#include <mach/cns3xxx.h>

#include <mach/pm.h>

#include "core.h"



void cns3xxx_pwr_clk_en(unsigned int block)

{
@@ -89,7 +89,7 @@ void cns3xxx_pwr_soft_rst(unsigned int block) 
}

EXPORT_SYMBOL(cns3xxx_pwr_soft_rst);



void arch_reset(char mode, const char *cmd)

void cns3xxx_restart(char mode, const char *cmd)

{

	/*

	 * To reset, we hit the on-board reset register