Commit 85d45ade authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents eda08410 fdb9c3cd

arch/arm/mach-msm/timer.c

+11 −3
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
#include <linux/io.h>



#include <asm/mach/time.h>

#include <asm/hardware/gic.h>



#include <mach/msm_iomap.h>

#include <mach/cpu.h>
@@ -55,10 +57,12 @@ enum timer_location { 
#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) || defined(CONFIG_ARCH_MSM8X60) || \

				      defined(CONFIG_ARCH_MSM8960)

#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)
@@ -100,7 +104,11 @@ static cycle_t msm_read_timer_count(struct clocksource *cs) 
{

	struct msm_clock *clk = container_of(cs, struct msm_clock, clocksource);



	return readl(clk->global_counter);

	/*

	 * Shift timer count down by a constant due to unreliable lower bits

	 * on some targets.

	 */

	return readl(clk->global_counter) >> clk->shift;

}



static struct msm_clock *clockevent_to_clock(struct clock_event_device *evt)