aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-iop13xx
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-iop13xx')
-rw-r--r--arch/arm/mach-iop13xx/include/mach/iop13xx.h5
-rw-r--r--arch/arm/mach-iop13xx/setup.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-iop13xx/include/mach/iop13xx.h b/arch/arm/mach-iop13xx/include/mach/iop13xx.h
index 7480f58267aa..17b40279e0a4 100644
--- a/arch/arm/mach-iop13xx/include/mach/iop13xx.h
+++ b/arch/arm/mach-iop13xx/include/mach/iop13xx.h
@@ -2,6 +2,9 @@
2#define _IOP13XX_HW_H_ 2#define _IOP13XX_HW_H_
3 3
4#ifndef __ASSEMBLY__ 4#ifndef __ASSEMBLY__
5
6#include <linux/reboot.h>
7
5/* The ATU offsets can change based on the strapping */ 8/* The ATU offsets can change based on the strapping */
6extern u32 iop13xx_atux_pmmr_offset; 9extern u32 iop13xx_atux_pmmr_offset;
7extern u32 iop13xx_atue_pmmr_offset; 10extern u32 iop13xx_atue_pmmr_offset;
@@ -11,7 +14,7 @@ void iop13xx_map_io(void);
11void iop13xx_platform_init(void); 14void iop13xx_platform_init(void);
12void iop13xx_add_tpmi_devices(void); 15void iop13xx_add_tpmi_devices(void);
13void iop13xx_init_irq(void); 16void iop13xx_init_irq(void);
14void iop13xx_restart(char, const char *); 17void iop13xx_restart(enum reboot_mode, const char *);
15 18
16/* CPUID CP6 R0 Page 0 */ 19/* CPUID CP6 R0 Page 0 */
17static inline int iop13xx_cpu_id(void) 20static inline int iop13xx_cpu_id(void)
diff --git a/arch/arm/mach-iop13xx/setup.c b/arch/arm/mach-iop13xx/setup.c
index 1c5bd7637b05..96e6c7a6793b 100644
--- a/arch/arm/mach-iop13xx/setup.c
+++ b/arch/arm/mach-iop13xx/setup.c
@@ -594,7 +594,7 @@ __setup("iop13xx_init_adma", iop13xx_init_adma_setup);
594__setup("iop13xx_init_uart", iop13xx_init_uart_setup); 594__setup("iop13xx_init_uart", iop13xx_init_uart_setup);
595__setup("iop13xx_init_i2c", iop13xx_init_i2c_setup); 595__setup("iop13xx_init_i2c", iop13xx_init_i2c_setup);
596 596
597void iop13xx_restart(char mode, const char *cmd) 597void iop13xx_restart(enum reboot_mode mode, const char *cmd)
598{ 598{
599 /* 599 /*
600 * Reset the internal bus (warning both cores are reset) 600 * Reset the internal bus (warning both cores are reset)