diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2016-09-20 21:11:08 +0300 |
|---|---|---|
| committer | Max Filippov <jcmvbkbc@gmail.com> | 2016-09-21 04:52:59 +0300 |
| commit | 205ad548a7426fb6813760cd9917d3fc24122576 (patch) | |
| tree | afee669f50dad5b75f622cecc03074d12c9b8e5f /arch/xtensa/kernel/setup.c | |
| parent | 58c3e3ac7a1daf56523567507a096a3e4026596d (diff) | |
| download | linux-205ad548a7426fb6813760cd9917d3fc24122576.tar.xz | |
xtensa: rearrange CCOUNT calibration
DT-enabled kernel should have a CPU node connected to a clock. This clock
is the CCOUNT clock. Use old platform_calibrate_ccount call as a fallback
when CPU node cannot be found or has no clock and in non-DT-enabled
configurations.
Drop no longer needed code that updates CPU clock-frequency property in
the DT; drop DT-related code from the platform_calibrate_ccount too.
Move of_clk_init to the top of time_init, so that clocks are initialized
before CCOUNT calibration is attempted.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'arch/xtensa/kernel/setup.c')
| -rw-r--r-- | arch/xtensa/kernel/setup.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 7ed63688f93c..d61c8468abea 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -23,7 +23,6 @@ #include <linux/bootmem.h> #include <linux/kernel.h> #include <linux/percpu.h> -#include <linux/clk-provider.h> #include <linux/cpu.h> #include <linux/of.h> #include <linux/of_fdt.h> @@ -249,7 +248,6 @@ void __init early_init_devtree(void *params) static int __init xtensa_device_probe(void) { - of_clk_init(NULL); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); return 0; } |