From: Tony Lindgren Date: Tue, 26 May 2009 21:41:35 +0000 (-0700) Subject: Merge branch 'omap-clock-upstream' of git://git.pwsan.com/linux-2.6 into for-next X-Git-Tag: v2.6.31-rc1~344^2~23^2~18 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=88b6f7eb9b4a06fbfe27f2d98e249577f4cfdaef;p=linux.git Merge branch 'omap-clock-upstream' of git://git.pwsan.com/linux-2.6 into for-next --- 88b6f7eb9b4a06fbfe27f2d98e249577f4cfdaef diff --cc arch/arm/plat-omap/sram.c index e1493d83a7c8,876f5a7ecafd..4f0145d26246 --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c @@@ -343,14 -365,17 +352,15 @@@ static inline int omap243x_sram_init(vo static u32 (*_omap3_sram_configure_core_dpll)(u32 sdrc_rfr_ctrl, u32 sdrc_actim_ctrla, u32 sdrc_actim_ctrlb, - u32 m2); + u32 m2, u32 unlock_dll); u32 omap3_configure_core_dpll(u32 sdrc_rfr_ctrl, u32 sdrc_actim_ctrla, - u32 sdrc_actim_ctrlb, u32 m2) + u32 sdrc_actim_ctrlb, u32 m2, u32 unlock_dll) { - if (!_omap3_sram_configure_core_dpll) - omap_sram_error(); - + BUG_ON(!_omap3_sram_configure_core_dpll); return _omap3_sram_configure_core_dpll(sdrc_rfr_ctrl, sdrc_actim_ctrla, - sdrc_actim_ctrlb, m2); + sdrc_actim_ctrlb, m2, + unlock_dll); } /* REVISIT: Should this be same as omap34xx_sram_init() after off-idle? */