minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-13 14:06:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

powerpc/mpc8xxx: Fix DDR code for empty first DIMM slot and enable DQS_en

Browse Source 
Check second DIMM slot in case the first one is empty.
Honor DQS enable option for SDRAM mode register.

Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
York Sun 2011-08-26 11:32:40 -07:00 committed by Kumar Gala
parent f8bc7bb5a7
commit cae7c1b56b
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c
View File

@ -160,7 +160,7 @@ static void set_csn_config(int dimm_number, int i, fsl_ddr_cfg_regs_t *ddr,
break; break;
case 2: case 2:
if ((dimm_number == 0 && dimm_params[0].n_ranks > 2) || \ if ((dimm_number == 0 && dimm_params[0].n_ranks > 2) || \
(dimm_number > 1 && dimm_params[dimm_number].n_ranks > 0)) (dimm_number >= 1 && dimm_params[dimm_number].n_ranks > 0))
go_config = 1; go_config = 1;
break; break;
case 3: case 3:
@ -631,7 +631,7 @@ static void set_ddr_sdram_cfg_2(fsl_ddr_cfg_regs_t *ddr,
unsigned int sr_ie = 0; /* Self-refresh interrupt enable */ unsigned int sr_ie = 0; /* Self-refresh interrupt enable */
unsigned int dll_rst_dis; /* DLL reset disable */ unsigned int dll_rst_dis; /* DLL reset disable */
unsigned int dqs_cfg; /* DQS configuration */ unsigned int dqs_cfg; /* DQS configuration */
unsigned int odt_cfg; /* ODT configuration */ unsigned int odt_cfg = 0; /* ODT configuration */
unsigned int num_pr; /* Number of posted refreshes */ unsigned int num_pr; /* Number of posted refreshes */
unsigned int obc_cfg; /* On-The-Fly Burst Chop Cfg */ unsigned int obc_cfg; /* On-The-Fly Burst Chop Cfg */
unsigned int ap_en; /* Address Parity Enable */ unsigned int ap_en; /* Address Parity Enable */
@ -639,15 +639,16 @@ static void set_ddr_sdram_cfg_2(fsl_ddr_cfg_regs_t *ddr,
unsigned int rcw_en = 0; /* Register Control Word Enable */ unsigned int rcw_en = 0; /* Register Control Word Enable */
unsigned int md_en = 0; /* Mirrored DIMM Enable */ unsigned int md_en = 0; /* Mirrored DIMM Enable */
unsigned int qd_en = 0; /* quad-rank DIMM Enable */ unsigned int qd_en = 0; /* quad-rank DIMM Enable */
int i;
dll_rst_dis = 1; /* Make this configurable */ dll_rst_dis = 1; /* Make this configurable */
dqs_cfg = popts->DQS_config; dqs_cfg = popts->DQS_config;
if (popts->cs_local_opts[0].odt_rd_cfg for (i = 0; i < CONFIG_CHIP_SELECTS_PER_CTRL; i++) {
|| popts->cs_local_opts[0].odt_wr_cfg) { if (popts->cs_local_opts[i].odt_rd_cfg
/* FIXME */ || popts->cs_local_opts[i].odt_wr_cfg) {
odt_cfg = 2; odt_cfg = SDRAM_CFG2_ODT_ONLY_READ;
} else { break;
odt_cfg = 0; }
} }
num_pr = 1; /* Make this configurable */ num_pr = 1; /* Make this configurable */
@ -1032,7 +1033,7 @@ static void set_ddr_sdram_mode(fsl_ddr_cfg_regs_t *ddr,
#if defined(CONFIG_FSL_DDR2) #if defined(CONFIG_FSL_DDR2)
const unsigned int mclk_ps = get_memory_clk_period_ps(); const unsigned int mclk_ps = get_memory_clk_period_ps();
#endif #endif
dqs_en = !popts->DQS_config;
rtt = fsl_ddr_get_rtt(); rtt = fsl_ddr_get_rtt();
al = additive_latency; al = additive_latency;

4
arch/powerpc/include/asm/fsl_ddr_sdram.h
View File

@ -92,6 +92,10 @@ typedef ddr3_spd_eeprom_t generic_spd_eeprom_t;
#define SDRAM_CFG2_D_INIT 0x00000010 #define SDRAM_CFG2_D_INIT 0x00000010
#define SDRAM_CFG2_ODT_CFG_MASK 0x00600000 #define SDRAM_CFG2_ODT_CFG_MASK 0x00600000
#define SDRAM_CFG2_ODT_NEVER 0
#define SDRAM_CFG2_ODT_ONLY_WRITE 1
#define SDRAM_CFG2_ODT_ONLY_READ 2
#define SDRAM_CFG2_ODT_ALWAYS 3
#define TIMING_CFG_2_CPO_MASK 0x0F800000 #define TIMING_CFG_2_CPO_MASK 0x0F800000