Skip to content

Commit

Permalink
ARM: OMAP2: Change 24xx to use shared clock code and new reg access
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Walmsley authored and Tony Lindgren committed Apr 14, 2008
1 parent 543d937 commit 6b8858a
Show file tree
Hide file tree
Showing 8 changed files with 562 additions and 238 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-omap2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#

# Common support
obj-y := irq.o id.o io.o sram-fn.o memory.o control.o prcm.o mux.o \
obj-y := irq.o id.o io.o sram-fn.o memory.o control.o prcm.o clock.o mux.o \
devices.o serial.o gpmc.o timer-gp.o

# Power Management
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-omap2/clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
Loading

0 comments on commit 6b8858a

Please sign in to comment.