Merge branch 'linus' into perfcounters/rename

Merge reason: pull in all the latest code before doing the rename.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 4 insertions, 1 deletions

diff --git a/arch/arm/mach-davinci/clock.c b/arch/arm/mach-davinci/clock.c
index 39bf321d70a2..83d54d50b5ea 100644
--- a/arch/arm/mach-davinci/clock.c
+++ b/arch/arm/mach-davinci/clock.c
@@ -227,7 +227,10 @@ static void __init clk_pll_init(struct clk *clk)
         if (ctrl & PLLCTL_PLLEN) {
                 bypass = 0;
                 mult = __raw_readl(pll->base + PLLM);
-                mult = (mult & PLLM_PLLM_MASK) + 1;
+                if (cpu_is_davinci_dm365())
+                        mult = 2 * (mult & PLLM_PLLM_MASK);
+                else
+                        mult = (mult & PLLM_PLLM_MASK) + 1;
         } else
                 bypass = 1;