diff options
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r-- | arch/arm/mach-imx/common.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-imx6q.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-imx/system.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h index ee78847abf47..cb6c838b63ed 100644 --- a/arch/arm/mach-imx/common.h +++ b/arch/arm/mach-imx/common.h | |||
@@ -11,6 +11,8 @@ | |||
11 | #ifndef __ASM_ARCH_MXC_COMMON_H__ | 11 | #ifndef __ASM_ARCH_MXC_COMMON_H__ |
12 | #define __ASM_ARCH_MXC_COMMON_H__ | 12 | #define __ASM_ARCH_MXC_COMMON_H__ |
13 | 13 | ||
14 | #include <linux/reboot.h> | ||
15 | |||
14 | struct platform_device; | 16 | struct platform_device; |
15 | struct pt_regs; | 17 | struct pt_regs; |
16 | struct clk; | 18 | struct clk; |
@@ -71,7 +73,7 @@ extern int mx53_clocks_init_dt(void); | |||
71 | extern struct platform_device *mxc_register_gpio(char *name, int id, | 73 | extern struct platform_device *mxc_register_gpio(char *name, int id, |
72 | resource_size_t iobase, resource_size_t iosize, int irq, int irq_high); | 74 | resource_size_t iobase, resource_size_t iosize, int irq, int irq_high); |
73 | extern void mxc_set_cpu_type(unsigned int type); | 75 | extern void mxc_set_cpu_type(unsigned int type); |
74 | extern void mxc_restart(char, const char *); | 76 | extern void mxc_restart(enum reboot_mode, const char *); |
75 | extern void mxc_arch_reset_init(void __iomem *); | 77 | extern void mxc_arch_reset_init(void __iomem *); |
76 | extern void mxc_arch_reset_init_dt(void); | 78 | extern void mxc_arch_reset_init_dt(void); |
77 | extern int mx53_revision(void); | 79 | extern int mx53_revision(void); |
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index f5965220a4d8..7be13f8e69a0 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/of_platform.h> | 27 | #include <linux/of_platform.h> |
28 | #include <linux/opp.h> | 28 | #include <linux/opp.h> |
29 | #include <linux/phy.h> | 29 | #include <linux/phy.h> |
30 | #include <linux/reboot.h> | ||
30 | #include <linux/regmap.h> | 31 | #include <linux/regmap.h> |
31 | #include <linux/micrel_phy.h> | 32 | #include <linux/micrel_phy.h> |
32 | #include <linux/mfd/syscon.h> | 33 | #include <linux/mfd/syscon.h> |
@@ -67,7 +68,7 @@ static void __init imx6q_init_revision(void) | |||
67 | mxc_set_cpu_type(rev >> 16 & 0xff); | 68 | mxc_set_cpu_type(rev >> 16 & 0xff); |
68 | } | 69 | } |
69 | 70 | ||
70 | static void imx6q_restart(char mode, const char *cmd) | 71 | static void imx6q_restart(enum reboot_mode mode, const char *cmd) |
71 | { | 72 | { |
72 | struct device_node *np; | 73 | struct device_node *np; |
73 | void __iomem *wdog_base; | 74 | void __iomem *wdog_base; |
diff --git a/arch/arm/mach-imx/system.c b/arch/arm/mach-imx/system.c index 7cdc79a9657c..6fe81bb4d3c9 100644 --- a/arch/arm/mach-imx/system.c +++ b/arch/arm/mach-imx/system.c | |||
@@ -37,7 +37,7 @@ static struct clk *wdog_clk; | |||
37 | /* | 37 | /* |
38 | * Reset the system. It is called by machine_restart(). | 38 | * Reset the system. It is called by machine_restart(). |
39 | */ | 39 | */ |
40 | void mxc_restart(char mode, const char *cmd) | 40 | void mxc_restart(enum reboot_mode mode, const char *cmd) |
41 | { | 41 | { |
42 | unsigned int wcr_enable; | 42 | unsigned int wcr_enable; |
43 | 43 | ||