.. | .. |
---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-only |
---|
1 | 2 | /* |
---|
2 | 3 | * linux/arch/arm/mach-mmp/mmp2-dt.c |
---|
3 | 4 | * |
---|
4 | 5 | * Copyright (C) 2012 Marvell Technology Group Ltd. |
---|
5 | 6 | * Author: Haojian Zhuang <haojian.zhuang@marvell.com> |
---|
6 | | - * |
---|
7 | | - * This program is free software; you can redistribute it and/or modify |
---|
8 | | - * it under the terms of the GNU General Public License version 2 as |
---|
9 | | - * publishhed by the Free Software Foundation. |
---|
10 | 7 | */ |
---|
11 | 8 | |
---|
12 | 9 | #include <linux/io.h> |
---|
13 | 10 | #include <linux/irqchip.h> |
---|
14 | 11 | #include <linux/of_platform.h> |
---|
15 | | -#include <linux/clk-provider.h> |
---|
| 12 | +#include <linux/of_clk.h> |
---|
| 13 | +#include <linux/clocksource.h> |
---|
16 | 14 | #include <asm/mach/arch.h> |
---|
17 | 15 | #include <asm/mach/time.h> |
---|
18 | 16 | #include <asm/hardware/cache-tauros2.h> |
---|
19 | 17 | |
---|
20 | 18 | #include "common.h" |
---|
21 | 19 | |
---|
22 | | -extern void __init mmp_dt_init_timer(void); |
---|
23 | | - |
---|
24 | 20 | static void __init mmp_init_time(void) |
---|
25 | 21 | { |
---|
26 | 22 | #ifdef CONFIG_CACHE_TAUROS2 |
---|
27 | 23 | tauros2_init(0); |
---|
28 | 24 | #endif |
---|
29 | | - mmp_dt_init_timer(); |
---|
30 | 25 | of_clk_init(NULL); |
---|
| 26 | + timer_probe(); |
---|
31 | 27 | } |
---|
32 | 28 | |
---|
33 | 29 | static const char *const mmp2_dt_board_compat[] __initconst = { |
---|
34 | | - "mrvl,mmp2-brownstone", |
---|
| 30 | + "mrvl,mmp2", |
---|
35 | 31 | NULL, |
---|
36 | 32 | }; |
---|
37 | 33 | |
---|
38 | 34 | DT_MACHINE_START(MMP2_DT, "Marvell MMP2 (Device Tree Support)") |
---|
39 | | - .map_io = mmp_map_io, |
---|
| 35 | + .map_io = mmp2_map_io, |
---|
40 | 36 | .init_time = mmp_init_time, |
---|
41 | 37 | .dt_compat = mmp2_dt_board_compat, |
---|
42 | 38 | MACHINE_END |
---|