From: Steve Sakoman Date: Fri, 1 Oct 2010 04:46:52 +0000 (-0700) Subject: ARMV7: OMAP3: Fix bug in get_sdr_cs_offset() X-Git-Tag: v2010.12-rc1~104^2~11 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=136c69ad7917f23d401c3a794cd0f5a4ab2230de;p=oweals%2Fu-boot.git ARMV7: OMAP3: Fix bug in get_sdr_cs_offset() This patch fixes a typo in the routine to calculate the cs offset based upon the contents of the SDRC cs_cfg register. This function mistakenly shifts the CS1STARTLOW field 17 bits right instead of 17 bits left. This hasn't been an issue to date because all OMAP3 boards currently are configured to have zeros in this field. Reported-by: Peter Maydell Signed-off-by: Steve Sakoman --- diff --git a/arch/arm/cpu/armv7/omap3/sdrc.c b/arch/arm/cpu/armv7/omap3/sdrc.c index 2719bb53a7..6c419f5b93 100644 --- a/arch/arm/cpu/armv7/omap3/sdrc.c +++ b/arch/arm/cpu/armv7/omap3/sdrc.c @@ -99,7 +99,7 @@ u32 get_sdr_cs_offset(u32 cs) return 0; offset = readl(&sdrc_base->cs_cfg); - offset = (offset & 15) << 27 | (offset & 0x30) >> 17; + offset = (offset & 15) << 27 | (offset & 0x30) << 17; return offset; }