diff options
Diffstat (limited to 'arch/arm/mach-sunxi/sunxi.c')
| -rw-r--r-- | arch/arm/mach-sunxi/sunxi.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c index 61d3a387f01c..aeea6ceea725 100644 --- a/arch/arm/mach-sunxi/sunxi.c +++ b/arch/arm/mach-sunxi/sunxi.c | |||
| @@ -10,6 +10,8 @@ | |||
| 10 | * warranty of any kind, whether express or implied. | 10 | * warranty of any kind, whether express or implied. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/clk-provider.h> | ||
| 14 | #include <linux/clocksource.h> | ||
| 13 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 14 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| @@ -23,6 +25,8 @@ | |||
| 23 | #include <asm/mach/map.h> | 25 | #include <asm/mach/map.h> |
| 24 | #include <asm/system_misc.h> | 26 | #include <asm/system_misc.h> |
| 25 | 27 | ||
| 28 | #include "common.h" | ||
| 29 | |||
| 26 | #define SUN4I_WATCHDOG_CTRL_REG 0x00 | 30 | #define SUN4I_WATCHDOG_CTRL_REG 0x00 |
| 27 | #define SUN4I_WATCHDOG_CTRL_RESTART BIT(0) | 31 | #define SUN4I_WATCHDOG_CTRL_RESTART BIT(0) |
| 28 | #define SUN4I_WATCHDOG_MODE_REG 0x04 | 32 | #define SUN4I_WATCHDOG_MODE_REG 0x04 |
| @@ -132,10 +136,20 @@ static const char * const sun6i_board_dt_compat[] = { | |||
| 132 | NULL, | 136 | NULL, |
| 133 | }; | 137 | }; |
| 134 | 138 | ||
| 139 | extern void __init sun6i_reset_init(void); | ||
| 140 | static void __init sun6i_timer_init(void) | ||
| 141 | { | ||
| 142 | of_clk_init(NULL); | ||
| 143 | sun6i_reset_init(); | ||
| 144 | clocksource_of_init(); | ||
| 145 | } | ||
| 146 | |||
| 135 | DT_MACHINE_START(SUN6I_DT, "Allwinner sun6i (A31) Family") | 147 | DT_MACHINE_START(SUN6I_DT, "Allwinner sun6i (A31) Family") |
| 136 | .init_machine = sunxi_dt_init, | 148 | .init_machine = sunxi_dt_init, |
| 149 | .init_time = sun6i_timer_init, | ||
| 137 | .dt_compat = sun6i_board_dt_compat, | 150 | .dt_compat = sun6i_board_dt_compat, |
| 138 | .restart = sun6i_restart, | 151 | .restart = sun6i_restart, |
| 152 | .smp = smp_ops(sun6i_smp_ops), | ||
| 139 | MACHINE_END | 153 | MACHINE_END |
| 140 | 154 | ||
| 141 | static const char * const sun7i_board_dt_compat[] = { | 155 | static const char * const sun7i_board_dt_compat[] = { |
