[U-Boot] [PATCH] Revert "rockchip: rk3288: correct sdram setting"

[U-Boot] [PATCH] Revert "rockchip: rk3288: correct sdram setting"

[Vagrant Cascadian]

This reverts commit b5788dc0dd9570e98552833767f4373db965985d.

Ram size is incorrectly reported as 512MB on a firefly-rk3288 board
with 2GB of ram. Reverting this patch displays the full amount of ram.

Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
---

 arch/arm/mach-rockchip/rk3288/sdram_rk3288.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-rockchip/rk3288/sdram_rk3288.c b/arch/arm/mach-rockchip/rk3288/sdram_rk3288.c
index 71330cb..2e21282 100644
--- a/arch/arm/mach-rockchip/rk3288/sdram_rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/sdram_rk3288.c
@@ -561,14 +561,14 @@ static void dram_all_config(const struct dram_info *dram,
 			&sdram_params->ch[chan];
 
 		sys_reg |= info->row_3_4 << SYS_REG_ROW_3_4_SHIFT(chan);
-		sys_reg |= 1 << SYS_REG_CHINFO_SHIFT(chan);
+		sys_reg |= chan << SYS_REG_CHINFO_SHIFT(chan);
 		sys_reg |= (info->rank - 1) << SYS_REG_RANK_SHIFT(chan);
 		sys_reg |= (info->col - 9) << SYS_REG_COL_SHIFT(chan);
-		sys_reg |= info->bk == 3 ? 0 : 1 << SYS_REG_BK_SHIFT(chan);
+		sys_reg |= info->bk == 3 ? 1 << SYS_REG_BK_SHIFT(chan) : 0;
 		sys_reg |= (info->cs0_row - 13) << SYS_REG_CS0_ROW_SHIFT(chan);
 		sys_reg |= (info->cs1_row - 13) << SYS_REG_CS1_ROW_SHIFT(chan);
-		sys_reg |= (2 >> info->bw) << SYS_REG_BW_SHIFT(chan);
-		sys_reg |= (2 >>info->dbw) << SYS_REG_DBW_SHIFT(chan);
+		sys_reg |= info->bw << SYS_REG_BW_SHIFT(chan);
+		sys_reg |= info->dbw << SYS_REG_DBW_SHIFT(chan);
 
 		dram_cfg_rbc(&dram->chan[chan], chan, sdram_params);
 	}
@@ -720,13 +720,13 @@ size_t sdram_size_mb(struct rk3288_pmu *pmu)
 		rank = 1 + (sys_reg >> SYS_REG_RANK_SHIFT(ch) &
 			SYS_REG_RANK_MASK);
 		col = 9 + (sys_reg >> SYS_REG_COL_SHIFT(ch) & SYS_REG_COL_MASK);
-		bk = 3 - ((sys_reg >> SYS_REG_BK_SHIFT(ch)) & SYS_REG_BK_MASK) ;
+		bk = sys_reg & (1 << SYS_REG_BK_SHIFT(ch)) ? 3 : 0;
 		cs0_row = 13 + (sys_reg >> SYS_REG_CS0_ROW_SHIFT(ch) &
 				SYS_REG_CS0_ROW_MASK);
 		cs1_row = 13 + (sys_reg >> SYS_REG_CS1_ROW_SHIFT(ch) &
 				SYS_REG_CS1_ROW_MASK);
-		bw = (2 >> (sys_reg >> SYS_REG_BW_SHIFT(ch)) &
-			SYS_REG_BW_MASK);
+		bw = (sys_reg >> SYS_REG_BW_SHIFT(ch)) &
+			SYS_REG_BW_MASK;
 		row_3_4 = sys_reg >> SYS_REG_ROW_3_4_SHIFT(ch) &
 			SYS_REG_ROW_3_4_MASK;
 
-- 
2.1.4

[U-Boot] [PATCH] Revert "rockchip: rk3288: correct sdram setting"

[Simon Glass]

On 15 April 2016 at 14:43, Vagrant Cascadian <vagrant@debian.org> wrote:
> This reverts commit b5788dc0dd9570e98552833767f4373db965985d.
>
> Ram size is incorrectly reported as 512MB on a firefly-rk3288 board
> with 2GB of ram. Reverting this patch displays the full amount of ram.
>
> Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
> ---
>
>  arch/arm/mach-rockchip/rk3288/sdram_rk3288.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)

Acked-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH] Revert "rockchip: rk3288: correct sdram setting"

[Simon Glass]

On 20 April 2016 at 13:25, Simon Glass <sjg@chromium.org> wrote:
> On 15 April 2016 at 14:43, Vagrant Cascadian <vagrant@debian.org> wrote:
>> This reverts commit b5788dc0dd9570e98552833767f4373db965985d.
>>
>> Ram size is incorrectly reported as 512MB on a firefly-rk3288 board
>> with 2GB of ram. Reverting this patch displays the full amount of ram.
>>
>> Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
>> ---
>>
>>  arch/arm/mach-rockchip/rk3288/sdram_rk3288.c | 14 +++++++-------
>>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> Acked-by: Simon Glass <sjg@chromium.org>

Applied to u-boot-rockchip/master, thanks!

[U-Boot] Revert "rockchip: rk3288: correct sdram setting"

[Tom Rini]

On Fri, Apr 15, 2016 at 01:43:25PM -0700, Vagrant Cascadian wrote:

> This reverts commit b5788dc0dd9570e98552833767f4373db965985d.
> 
> Ram size is incorrectly reported as 512MB on a firefly-rk3288 board
> with 2GB of ram. Reverting this patch displays the full amount of ram.
> 
> Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
> Acked-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160502/6b326621/attachment.sig>