reset_cpu: unify declaration
include/common.h declares this as "unsigned long addr", so we unify it. This also silences a doxygen warning. Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
c3626f2a0d
commit
724d3d8672
|
@ -73,7 +73,7 @@ core_initcall(clocksource_init);
|
|||
/*
|
||||
* Reset the cpu through the reset controller
|
||||
*/
|
||||
void __noreturn reset_cpu (unsigned long ignored)
|
||||
void __noreturn reset_cpu (unsigned long addr)
|
||||
{
|
||||
at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY |
|
||||
AT91_RSTC_PROCRST |
|
||||
|
|
|
@ -72,7 +72,7 @@ core_initcall(clocksource_init);
|
|||
/*
|
||||
* Reset the cpu
|
||||
*/
|
||||
void __noreturn reset_cpu(unsigned long ignored)
|
||||
void __noreturn reset_cpu(unsigned long addr)
|
||||
{
|
||||
struct syscon_regs *syscon = (struct syscon_regs *)SYSCON_BASE;
|
||||
uint32_t value;
|
||||
|
|
|
@ -118,7 +118,7 @@ core_initcall(clocksource_init);
|
|||
/*
|
||||
* Reset the cpu by setting up the watchdog timer and let it time out
|
||||
*/
|
||||
void __noreturn reset_cpu (unsigned long ignored)
|
||||
void __noreturn reset_cpu (unsigned long addr)
|
||||
{
|
||||
/* Disable watchdog and set Time-Out field to 0 */
|
||||
writew(0x0, IMX_WDT_BASE + WDOG_WCR);
|
||||
|
|
|
@ -52,11 +52,11 @@
|
|||
*
|
||||
* In case of crashes, reset the CPU
|
||||
*
|
||||
* @param[in] addr -Cause of crash
|
||||
* @param addr Cause of crash
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
void __noreturn reset_cpu(ulong addr)
|
||||
void __noreturn reset_cpu(unsigned long addr)
|
||||
{
|
||||
/* FIXME: Enable WDT and cause reset */
|
||||
hang();
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
* TODO There is a much easier way to reset the CPU: Refer bit 2 in
|
||||
* the HW_CLKCTRL_RESET register, data sheet page 106/4-30
|
||||
*/
|
||||
void __noreturn reset_cpu (unsigned long ignored)
|
||||
void __noreturn reset_cpu (unsigned long addr)
|
||||
{
|
||||
writel(WDOG_COUNTER_RATE, IMX_WDT_BASE + HW_RTC_WATCHDOG);
|
||||
writel(BM_RTC_CTRL_WATCHDOGEN, IMX_WDT_BASE + HW_RTC_CTRL_SET);
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include <asm/cpu.h>
|
||||
#include <init.h>
|
||||
|
||||
void __noreturn reset_cpu(ulong ignored)
|
||||
void __noreturn reset_cpu(unsigned long addr)
|
||||
{
|
||||
icache_disable();
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
/**
|
||||
* Reset the cpu by setting up the watchdog timer and let it time out
|
||||
*/
|
||||
void __noreturn reset_cpu (unsigned long ignored)
|
||||
void __noreturn reset_cpu (unsigned long addr)
|
||||
{
|
||||
while ( ignored ) { ; };
|
||||
|
||||
|
|
|
@ -71,7 +71,7 @@ int checkcpu (void)
|
|||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
void __noreturn reset_cpu (unsigned long unused)
|
||||
void __noreturn reset_cpu (unsigned long addr)
|
||||
{
|
||||
ulong msr;
|
||||
/* Interrupts and MMU off */
|
||||
|
|
|
@ -138,7 +138,7 @@ uint64_t linux_get_time(void)
|
|||
return now;
|
||||
}
|
||||
|
||||
void __attribute__((noreturn)) reset_cpu(int unused)
|
||||
void __attribute__((noreturn)) reset_cpu(unsigned long addr)
|
||||
{
|
||||
cookmode();
|
||||
exit(0);
|
||||
|
|
Loading…
Reference in New Issue