diff options
| author | Mark Brown <[email protected]> | 2017-04-06 11:50:04 +0100 |
|---|---|---|
| committer | Mark Brown <[email protected]> | 2017-04-06 11:50:04 +0100 |
| commit | 3a37471551cd3b287ce7f02ed25bcf8ec37a191d (patch) | |
| tree | f7bacf98400f55bed2737c9f7cf3b68f9a070c2b /drivers/clocksource/qcom-timer.c | |
| parent | e0c4211854bfebd5507761a2bfddaa9e37074230 (diff) | |
| parent | fc99d23f6d3ec6b17772915114018444393e0ad1 (diff) | |
Merge branch 'fix/rcar' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rcar
Diffstat (limited to 'drivers/clocksource/qcom-timer.c')
| -rw-r--r-- | drivers/clocksource/qcom-timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/qcom-timer.c b/drivers/clocksource/qcom-timer.c index 3283cfa2aa52..ee358cdf4a07 100644 --- a/drivers/clocksource/qcom-timer.c +++ b/drivers/clocksource/qcom-timer.c @@ -89,7 +89,7 @@ static struct clock_event_device __percpu *msm_evt; static void __iomem *source_base; -static notrace cycle_t msm_read_timer_count(struct clocksource *cs) +static notrace u64 msm_read_timer_count(struct clocksource *cs) { return readl_relaxed(source_base + TIMER_COUNT_VAL); } @@ -182,7 +182,7 @@ static int __init msm_timer_init(u32 dgt_hz, int sched_bits, int irq, } else { /* Install and invoke hotplug callbacks */ res = cpuhp_setup_state(CPUHP_AP_QCOM_TIMER_STARTING, - "AP_QCOM_TIMER_STARTING", + "clockevents/qcom/timer:starting", msm_local_timer_starting_cpu, msm_local_timer_dying_cpu); if (res) { |