From: Rajendra Nayak <rnayak@xxxxxx> This patch fixes a bug in the CORE dpll scaling sequence which was errouneously clearing some bits in the SDRC DLLA CTRL register and hence causing a freeze. The issue was observed only on platforms which scale CORE dpll to < 83Mhz and hence program the DLL in fixed delay mode. Issue reported by Limei Wang <E12499@xxxxxxxxxxxx>, with debugging assistance from Richard Woodruff <r-woodruff2@xxxxxx> and Girish Ghongdemath <girishsg@xxxxxx>. Signed-off-by: Rajendra Nayak <rnayak@xxxxxx> Cc: Limei Wang <E12499@xxxxxxxxxxxx> Cc: Richard Woodruff <r-woodruff2@xxxxxx> Cc: Girish Ghongdemath <girishsg@xxxxxx> Signed-off-by: Paul Walmsley <paul@xxxxxxxxx> [paul@xxxxxxxxx: updated patch description to include collaboration credits] --- arch/arm/mach-omap2/sram34xx.S | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/sram34xx.S b/arch/arm/mach-omap2/sram34xx.S index 9c2d046..e6b1125 100644 --- a/arch/arm/mach-omap2/sram34xx.S +++ b/arch/arm/mach-omap2/sram34xx.S @@ -143,7 +143,7 @@ return_to_sdram: unlock_dll: ldr r11, omap3_sdrc_dlla_ctrl ldr r12, [r11] - and r12, r12, #FIXEDDELAY_MASK + bic r12, r12, #FIXEDDELAY_MASK orr r12, r12, #FIXEDDELAY_DEFAULT orr r12, r12, #DLLIDLE_MASK str r12, [r11] @ (no OCP barrier needed) -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html