| commit | c4c01b9d93b77ae6a685d9ec8bb68993da3061d9 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Thu Oct 04 00:15:00 2012 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Thu Oct 04 00:15:00 2012 -0700 |
| tree | 379197b31a15196b99a9f4761f18d8fe3de1d03b | |
| parent | 677ccef34df55f67b1583386464df3d52be99dd9 [diff] | |
| parent | 73db3ad247a9ab74c8edeca59b961594d1cdb13d [diff] |
Merge "msm: clock-8960: Correctly measure KPSS pass3 debug clocks"
diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c index 1e01dc1..2cd2cd4 100644 --- a/arch/arm/mach-msm/clock-8960.c +++ b/arch/arm/mach-msm/clock-8960.c
@@ -5090,6 +5090,8 @@ writel_relaxed(0x80|BVAL(5, 3, clk_sel), GCC_APCS_CLK_DIAG); measure->sample_ticks = 0x4000; measure->multiplier = 2; + if (cpu_is_krait_v3()) + measure->multiplier = 8; break; default: ret = -EPERM;