diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2016-09-20 11:11:08 -0700 |
|---|---|---|
| committer | Max Filippov <jcmvbkbc@gmail.com> | 2016-09-20 18:52:59 -0700 |
| commit | 205ad548a7426fb6813760cd9917d3fc24122576 (patch) | |
| tree | afee669f50dad5b75f622cecc03074d12c9b8e5f /arch/xtensa/boot | |
| parent | 58c3e3ac7a1daf56523567507a096a3e4026596d (diff) | |
| download | linux-205ad548a7426fb6813760cd9917d3fc24122576.tar.gz linux-205ad548a7426fb6813760cd9917d3fc24122576.tar.bz2 linux-205ad548a7426fb6813760cd9917d3fc24122576.zip | |
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/boot')
| -rw-r--r-- | arch/xtensa/boot/dts/xtfpga.dtsi | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/xtensa/boot/dts/xtfpga.dtsi b/arch/xtensa/boot/dts/xtfpga.dtsi index ded56984dd23..91616a9d79df 100644 --- a/arch/xtensa/boot/dts/xtfpga.dtsi +++ b/arch/xtensa/boot/dts/xtfpga.dtsi @@ -19,9 +19,7 @@ cpu@0 { compatible = "cdns,xtensa-cpu"; reg = <0>; - /* Filled in by platform_setup from FPGA register - * clock-frequency = <100000000>; - */ + clocks = <&osc>; }; }; |