Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

msm: timer: Remove SoC specific #ifdefs

Browse source 
The timer frequency is currently ifdefed in addition to setting
the DGT clock's divider value on SCORPIONMP targets. Setup the
frequency dynamically using the existing cpu_is_*() branches and
assign a custom clocksource read function for 7x01a to get the
shift out of the generic path.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: David Brown <davidb@codeaurora.org>
This commit is contained in:
Stephen Boyd 2011-11-08 10:34:08 -08:00 committed by David Brown
parent 2a00c1068b
commit 2081a6b57f
1 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
arch/arm/mach-msm/timer.c
View file

@ -40,20 +40,7 @@
#define GPT_HZ 32768 #define GPT_HZ 32768
/* TODO: Remove these ifdefs */ #define MSM_DGT_SHIFT 5
#if defined(CONFIG_ARCH_QSD8X50)
#define DGT_HZ (19200000 / 4) /* 19.2 MHz / 4 by default */
#define MSM_DGT_SHIFT (0)
#elif defined(CONFIG_ARCH_MSM7X30)
#define DGT_HZ (24576000 / 4) /* 24.576 MHz (LPXO) / 4 by default */
#define MSM_DGT_SHIFT (0)
#elif defined(CONFIG_ARCH_MSM8X60) || defined(CONFIG_ARCH_MSM8960)
#define DGT_HZ (27000000 / 4) /* 27 MHz (PXO) / 4 by default */
#define MSM_DGT_SHIFT (0)
#else
#define DGT_HZ 19200000 /* 19.2 MHz or 600 KHz after shift */
#define MSM_DGT_SHIFT (5)
#endif
static void __iomem *event_base; static void __iomem *event_base;
@ -122,19 +109,24 @@ static union {
static void __iomem *source_base; static void __iomem *source_base;
static cycle_t msm_read_timer_count(struct clocksource *cs) static cycle_t msm_read_timer_count(struct clocksource *cs)
{
return readl_relaxed(source_base + TIMER_COUNT_VAL);
}
static cycle_t msm_read_timer_count_shift(struct clocksource *cs)
{ {
/* /*
* Shift timer count down by a constant due to unreliable lower bits * Shift timer count down by a constant due to unreliable lower bits
* on some targets. * on some targets.
*/ */
return readl_relaxed(source_base + TIMER_COUNT_VAL) >> MSM_DGT_SHIFT; return msm_read_timer_count(cs) >> MSM_DGT_SHIFT;
} }
static struct clocksource msm_clocksource = { static struct clocksource msm_clocksource = {
.name = "dg_timer", .name = "dg_timer",
.rating = 300, .rating = 300,
.read = msm_read_timer_count, .read = msm_read_timer_count,
.mask = CLOCKSOURCE_MASK((32 - MSM_DGT_SHIFT)), .mask = CLOCKSOURCE_MASK(32),
.flags = CLOCK_SOURCE_IS_CONTINUOUS, .flags = CLOCK_SOURCE_IS_CONTINUOUS,
}; };
@ -143,27 +135,31 @@ static void __init msm_timer_init(void)
struct clock_event_device *ce = &msm_clockevent; struct clock_event_device *ce = &msm_clockevent;
struct clocksource *cs = &msm_clocksource; struct clocksource *cs = &msm_clocksource;
int res; int res;
u32 dgt_hz;
if (cpu_is_msm7x01()) { if (cpu_is_msm7x01()) {
event_base = MSM_CSR_BASE; event_base = MSM_CSR_BASE;
source_base = MSM_CSR_BASE + 0x10; source_base = MSM_CSR_BASE + 0x10;
dgt_hz = 19200000 >> MSM_DGT_SHIFT; /* 600 KHz */
cs->read = msm_read_timer_count_shift;
cs->mask = CLOCKSOURCE_MASK((32 - MSM_DGT_SHIFT));
} else if (cpu_is_msm7x30()) { } else if (cpu_is_msm7x30()) {
event_base = MSM_CSR_BASE + 0x04; event_base = MSM_CSR_BASE + 0x04;
source_base = MSM_CSR_BASE + 0x24; source_base = MSM_CSR_BASE + 0x24;
dgt_hz = 24576000 / 4;
} else if (cpu_is_qsd8x50()) { } else if (cpu_is_qsd8x50()) {
event_base = MSM_CSR_BASE; event_base = MSM_CSR_BASE;
source_base = MSM_CSR_BASE + 0x10; source_base = MSM_CSR_BASE + 0x10;
dgt_hz = 19200000 / 4;
} else if (cpu_is_msm8x60() || cpu_is_msm8960()) { } else if (cpu_is_msm8x60() || cpu_is_msm8960()) {
event_base = MSM_TMR_BASE + 0x04; event_base = MSM_TMR_BASE + 0x04;
/* Use CPU0's timer as the global clock source. */ /* Use CPU0's timer as the global clock source. */
source_base = MSM_TMR0_BASE + 0x24; source_base = MSM_TMR0_BASE + 0x24;
dgt_hz = 27000000 / 4;
writel_relaxed(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL);
} else } else
BUG(); BUG();
#ifdef CONFIG_ARCH_MSM_SCORPIONMP
writel(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL);
#endif
writel_relaxed(0, event_base + TIMER_ENABLE); writel_relaxed(0, event_base + TIMER_ENABLE);
writel_relaxed(0, event_base + TIMER_CLEAR); writel_relaxed(0, event_base + TIMER_CLEAR);
writel_relaxed(~0, event_base + TIMER_MATCH_VAL); writel_relaxed(~0, event_base + TIMER_MATCH_VAL);
@ -201,7 +197,7 @@ static void __init msm_timer_init(void)
clockevents_register_device(ce); clockevents_register_device(ce);
err: err:
writel_relaxed(TIMER_ENABLE_EN, source_base + TIMER_ENABLE); writel_relaxed(TIMER_ENABLE_EN, source_base + TIMER_ENABLE);
res = clocksource_register_hz(cs, DGT_HZ >> MSM_DGT_SHIFT); res = clocksource_register_hz(cs, dgt_hz);
if (res) if (res)
pr_err("clocksource_register failed\n"); pr_err("clocksource_register failed\n");
} }