Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / drivers / clocksource / clksrc-dbx500-prcmu.c

diff --git a/drivers/clocksource/clksrc-dbx500-prcmu.c b/drivers/clocksource/clksrc-dbx500-prcmu.c
index fb6b6d28b60ec26450d7b47ffc556cfaf5825822..c26c369eb9e6f72a8adc92d69e2a085bced89f1c 100644 (file)
--- a/drivers/clocksource/clksrc-dbx500-prcmu.c
+++ b/drivers/clocksource/clksrc-dbx500-prcmu.c
@@ -52,7 +52,6 @@ static struct clocksource clocksource_dbx500_prcmu = {
        .name           = "dbx500-prcmu-timer",
        .rating         = 300,
        .read           = clksrc_dbx500_prcmu_read,
-       .shift          = 10,
        .mask           = CLOCKSOURCE_MASK(32),
        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
@@ -90,7 +89,5 @@ void __init clksrc_dbx500_prcmu_init(void __iomem *base)
        setup_sched_clock(dbx500_prcmu_sched_clock_read,
                         32, RATE_32K);
 #endif
-       clocksource_calc_mult_shift(&clocksource_dbx500_prcmu,
-                                   RATE_32K, SCHED_CLOCK_MIN_WRAP);
-       clocksource_register(&clocksource_dbx500_prcmu);
+       clocksource_register_hz(&clocksource_dbx500_prcmu, RATE_32K);
 }