diff options
| author | Paul Walmsley <paul@pwsan.com> | 2008-03-18 11:35:15 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2008-04-14 21:29:38 +0400 |
| commit | 6b8858a972a0eff1dc1ab77b0fd9fc25387c217c (patch) | |
| tree | a34e94f4d372670c5125e8f490c85e9364d222df /arch/arm/mach-omap2/clock.c | |
| parent | 543d93781a3c744017594d0721c4c1814a26bcce (diff) | |
| download | linux-6b8858a972a0eff1dc1ab77b0fd9fc25387c217c.tar.xz | |
ARM: OMAP2: Change 24xx to use shared clock code and new reg access
This patch changes 24xx to use shared clock code and new register
access.
Note that patch adds some temporary OLD_CK defines to keep patch
more readable. These temporary defines will be removed in the next
patch. Also not all clocks are changed in this patch to limit the
size.
Also, the patch fixes few incorrect clock defines in clock24xx.h.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/clock.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index a921efd43a70..b76c9fc1b8e9 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c @@ -122,7 +122,7 @@ u32 omap2_get_dpll_rate(struct clk *clk) if (dd->div2_reg) { dpll = __raw_readl(dd->div2_reg); dpll_div = dpll & dd->div2_mask; - dpll_div >>= __fss(dd->div2_mask); + dpll_div >>= __ffs(dd->div2_mask); do_div(dpll_clk, dpll_div + 1); } |