arm: Correct cpu_reset function prototype on some platforms
Some platforms were not including <cpu_func.h> which sets the prototype
for reset_cpu, and in turn had it set wrong. Correct these cases.
Signed-off-by: Tom Rini <trini@konsulko.com>
diff --git a/arch/arm/mach-hpe/gxp/reset.c b/arch/arm/mach-hpe/gxp/reset.c
index ce018a3..a147bca 100644
--- a/arch/arm/mach-hpe/gxp/reset.c
+++ b/arch/arm/mach-hpe/gxp/reset.c
@@ -7,6 +7,7 @@
* Author: Jean-Marie Verdun <verdun@hpe.com>
*/
+#include <cpu_func.h>
#include <asm/io.h>
#define GXP_CCR 0xc0000000
@@ -16,7 +17,7 @@
{
}
-void reset_cpu(ulong ignored)
+void reset_cpu(void)
{
writel(1, GXP_CCR);
diff --git a/arch/arm/mach-mediatek/mt7981/init.c b/arch/arm/mach-mediatek/mt7981/init.c
index d8b10f0..3c921d6 100644
--- a/arch/arm/mach-mediatek/mt7981/init.c
+++ b/arch/arm/mach-mediatek/mt7981/init.c
@@ -4,6 +4,7 @@
* Author: Sam Shih <sam.shih@mediatek.com>
*/
+#include <cpu_func.h>
#include <init.h>
#include <asm/armv8/mmu.h>
#include <asm/system.h>
@@ -19,7 +20,7 @@
return 0;
}
-void reset_cpu(ulong addr)
+void reset_cpu(void)
{
psci_system_reset();
}
diff --git a/arch/arm/mach-mediatek/mt7986/init.c b/arch/arm/mach-mediatek/mt7986/init.c
index fb74b2f..9d0c0cd 100644
--- a/arch/arm/mach-mediatek/mt7986/init.c
+++ b/arch/arm/mach-mediatek/mt7986/init.c
@@ -4,6 +4,7 @@
* Author: Sam Shih <sam.shih@mediatek.com>
*/
+#include <cpu_func.h>
#include <init.h>
#include <asm/armv8/mmu.h>
#include <asm/system.h>
@@ -19,7 +20,7 @@
return 0;
}
-void reset_cpu(ulong addr)
+void reset_cpu(void)
{
psci_system_reset();
}
diff --git a/board/armltd/corstone1000/corstone1000.c b/board/armltd/corstone1000/corstone1000.c
index 4f4b96a..6ec8e61 100644
--- a/board/armltd/corstone1000/corstone1000.c
+++ b/board/armltd/corstone1000/corstone1000.c
@@ -6,6 +6,7 @@
*/
#include <common.h>
+#include <cpu_func.h>
#include <dm.h>
#include <netdev.h>
#include <dm/platform_data/serial_pl01x.h>
@@ -86,6 +87,6 @@
return 0;
}
-void reset_cpu(ulong addr)
+void reset_cpu(void)
{
}
diff --git a/board/bosch/acc/acc.c b/board/bosch/acc/acc.c
index 770ca8b..4a0603d 100644
--- a/board/bosch/acc/acc.c
+++ b/board/bosch/acc/acc.c
@@ -6,6 +6,7 @@
*/
#include <common.h>
+#include <cpu_func.h>
#include <bootstage.h>
#include <dm.h>
#include <dm/platform_data/serial_mxc.h>
@@ -720,7 +721,7 @@
return -1;
}
-void reset_cpu(ulong addr)
+void reset_cpu(void)
{
puts("Hanging CPU for watchdog reset!\n");
hang();