2 files changed, 5 insertions, 3 deletions

diff --git a/drivers/clocksource/mmio.c b/drivers/clocksource/mmio.c
index 1593ade2a815..c4f7d7a9b689 100644
--- a/drivers/clocksource/mmio.c
+++ b/drivers/clocksource/mmio.c
@@ -55,7 +55,7 @@ int __init clocksource_mmio_init(void __iomem *base, const char *name,
 {
         struct clocksource_mmio *cs;
 
-        if (bits > 32 || bits < 16)
+        if (bits > 64 || bits < 16)
                 return -EINVAL;
 
         cs = kzalloc(sizeof(struct clocksource_mmio), GFP_KERNEL);
diff --git a/drivers/clocksource/vt8500_timer.c b/drivers/clocksource/vt8500_timer.c
index de49805fbb09..ddb409274f45 100644
--- a/drivers/clocksource/vt8500_timer.c
+++ b/drivers/clocksource/vt8500_timer.c
@@ -49,6 +49,8 @@
 
 #define msecs_to_loops(t) (loops_per_jiffy / 1000 * HZ * t)
 
+#define MIN_OSCR_DELTA          16
+
 static void __iomem *regbase;
 
 static cycle_t vt8500_timer_read(struct clocksource *cs)
@@ -79,7 +81,7 @@ static int vt8500_timer_set_next_event(unsigned long cycles,
                 cpu_relax();
         writel((unsigned long)alarm, regbase + TIMER_MATCH_VAL);
 
-        if ((signed)(alarm - clocksource.read(&clocksource)) <= 16)
+        if ((signed)(alarm - clocksource.read(&clocksource)) <= MIN_OSCR_DELTA)
                 return -ETIME;
 
         writel(1, regbase + TIMER_IER_VAL);
@@ -150,7 +152,7 @@ static void __init vt8500_timer_init(struct device_node *np)
                 pr_err("%s: setup_irq failed for %s\n", __func__,
                                                         clockevent.name);
         clockevents_config_and_register(&clockevent, VT8500_TIMER_HZ,
-                                        4, 0xf0000000);
+                                        MIN_OSCR_DELTA * 2, 0xf0000000);
 }
 
 CLOCKSOURCE_OF_DECLARE(vt8500, "via,vt8500-timer", vt8500_timer_init);