From d51afcd059e5803d6c255c12099679fea545452e Mon Sep 17 00:00:00 2001 From: Cyril Chemparathy Date: Wed, 20 Oct 2010 17:49:56 -0400 Subject: [PATCH] --- yaml --- r: 225979 b: refs/heads/master c: b1d05be61f5d29118c2934e684628a5034186825 h: refs/heads/master i: 225977: b55b94d298d0c0dee7b0793ff3d494f63536d280 225975: a06f5f7728df1a81869c95e74889c92f7e51bbd7 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-davinci/clock.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8745aca099be..8f6efa3c7213 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d1c57c84cc474a0fa63aadaa260b13dc5c7d68b +refs/heads/master: b1d05be61f5d29118c2934e684628a5034186825 diff --git a/trunk/arch/arm/mach-davinci/clock.c b/trunk/arch/arm/mach-davinci/clock.c index 01ba080433db..e4e3af179f02 100644 --- a/trunk/arch/arm/mach-davinci/clock.c +++ b/trunk/arch/arm/mach-davinci/clock.c @@ -336,7 +336,7 @@ int davinci_set_sysclk_rate(struct clk *clk, unsigned long rate) ratio--; } - if (ratio > PLLDIV_RATIO_MASK) + if (ratio > pll->div_ratio_mask) return -EINVAL; do { @@ -344,7 +344,7 @@ int davinci_set_sysclk_rate(struct clk *clk, unsigned long rate) } while (v & PLLSTAT_GOSTAT); v = __raw_readl(pll->base + clk->div_reg); - v &= ~PLLDIV_RATIO_MASK; + v &= ~pll->div_ratio_mask; v |= ratio | PLLDIV_EN; __raw_writel(v, pll->base + clk->div_reg);