Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm
* 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm:
msm: timer: Fix DGT rate on 8960 and 8660
msm: timer: compensate for timer shift in msm_read_timer_count
msm: timer: Fix SMP build error
+11
-3
+11
-3
arch/arm/mach-msm/timer.c
+11
-3
arch/arm/mach-msm/timer.c
···
23
23
#include <linux/io.h>
24
24
25
25
#include <asm/mach/time.h>
26
+
#include <asm/hardware/gic.h>
27
+
26
28
#include <mach/msm_iomap.h>
27
29
#include <mach/cpu.h>
28
30
···
57
55
#if defined(CONFIG_ARCH_QSD8X50)
58
56
#define DGT_HZ (19200000 / 4) /* 19.2 MHz / 4 by default */
59
57
#define MSM_DGT_SHIFT (0)
60
-
#elif defined(CONFIG_ARCH_MSM7X30) || defined(CONFIG_ARCH_MSM8X60) || \
61
-
defined(CONFIG_ARCH_MSM8960)
58
+
#elif defined(CONFIG_ARCH_MSM7X30)
62
59
#define DGT_HZ (24576000 / 4) /* 24.576 MHz (LPXO) / 4 by default */
60
+
#define MSM_DGT_SHIFT (0)
61
+
#elif defined(CONFIG_ARCH_MSM8X60) || defined(CONFIG_ARCH_MSM8960)
62
+
#define DGT_HZ (27000000 / 4) /* 27 MHz (PXO) / 4 by default */
63
63
#define MSM_DGT_SHIFT (0)
64
64
#else
65
65
#define DGT_HZ 19200000 /* 19.2 MHz or 600 KHz after shift */
···
104
100
{
105
101
struct msm_clock *clk = container_of(cs, struct msm_clock, clocksource);
106
102
107
-
return readl(clk->global_counter);
103
+
/*
104
+
* Shift timer count down by a constant due to unreliable lower bits
105
+
* on some targets.
106
+
*/
107
+
return readl(clk->global_counter) >> clk->shift;
108
108
}
109
109
110
110
static struct msm_clock *clockevent_to_clock(struct clock_event_device *evt)