diff options
Diffstat (limited to 'board/tqc/tqm85xx/sdram.c')
| -rw-r--r-- | board/tqc/tqm85xx/sdram.c | 150 | 
1 files changed, 148 insertions, 2 deletions
| diff --git a/board/tqc/tqm85xx/sdram.c b/board/tqc/tqm85xx/sdram.c index e005d844f..442ff667c 100644 --- a/board/tqc/tqm85xx/sdram.c +++ b/board/tqc/tqm85xx/sdram.c @@ -30,16 +30,27 @@  struct sdram_conf_s {  	unsigned long size;  	unsigned long reg; +#ifdef CONFIG_TQM8548 +	unsigned long refresh; +#endif /* CONFIG_TQM8548 */  };  typedef struct sdram_conf_s sdram_conf_t; +#ifdef CONFIG_TQM8548 +sdram_conf_t ddr_cs_conf[] = { +	{(512 << 20), 0x80044102, 0x0001A000},	/* 512MB, 13x10(4)	*/ +	{(256 << 20), 0x80040102, 0x00014000},	/* 256MB, 13x10(4)	*/ +	{(128 << 20), 0x80040101, 0x0000C000},	/* 128MB, 13x9(4)	*/ +}; +#else /* !CONFIG_TQM8548 */  sdram_conf_t ddr_cs_conf[] = {  	{(512 << 20), 0x80000202},	/* 512MB, 14x10(4)	*/  	{(256 << 20), 0x80000102},	/* 256MB, 13x10(4)	*/  	{(128 << 20), 0x80000101},	/* 128MB, 13x9(4)	*/  	{( 64 << 20), 0x80000001},	/*  64MB, 12x9(4)	*/  }; +#endif /* CONFIG_TQM8548 */  #define	N_DDR_CS_CONF (sizeof(ddr_cs_conf) / sizeof(ddr_cs_conf[0])) @@ -56,8 +67,12 @@ long int sdram_setup (int casl)  {  	int i;  	volatile ccsr_ddr_t *ddr = (void *)(CFG_MPC85xx_DDR_ADDR); +#ifdef CONFIG_TQM8548 +	volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR); +#else /* !CONFIG_TQM8548 */  	unsigned long cfg_ddr_timing1;  	unsigned long cfg_ddr_mode; +#endif /* CONFIG_TQM8548 */  	/*  	 * Disable memory controller. @@ -65,6 +80,122 @@ long int sdram_setup (int casl)  	ddr->cs0_config = 0;  	ddr->sdram_cfg = 0; +#ifdef CONFIG_TQM8548 +	ddr->cs0_bnds = (ddr_cs_conf[0].size - 1) >> 24; +	ddr->cs0_config = ddr_cs_conf[0].reg; +	ddr->timing_cfg_3 = 0x00010000; + +	/* TIMING CFG 1, 533MHz +	 * PRETOACT: 4 Clocks +	 * ACTTOPRE: 12 Clocks +	 * ACTTORW:  4 Clocks +	 * CASLAT:   4 Clocks +	 * REFREC:   34 Clocks +	 * WRREC:    4 Clocks +	 * ACTTOACT: 3 Clocks +	 * WRTORD:   2 Clocks +	 */ +	ddr->timing_cfg_1 = 0x4C47A432; + +	/* TIMING CFG 2, 533MHz +	 * ADD_LAT:       3 Clocks +	 * CPO:           READLAT + 1 +	 * WR_LAT:        3 Clocks +	 * RD_TO_PRE:     2 Clocks +	 * WR_DATA_DELAY: 1/2 Clock +	 * CKE_PLS:       1 Clock +	 * FOUR_ACT:      13 Clocks +	 */ +	ddr->timing_cfg_2 = 0x3318484D; + +	/* DDR SDRAM Mode, 533MHz +	 * MRS:          Extended Mode Register +	 * OUT:          Outputs enabled +	 * RDQS:         no +	 * DQS:          enabled +	 * OCD:          default state +	 * RTT:          75 Ohms +	 * Posted CAS:   3 Clocks +	 * ODS:          reduced strength +	 * DLL:          enabled +	 * MR:           Mode Register +	 * PD:           fast exit +	 * WR:           4 Clocks +	 * DLL:          no DLL reset +	 * TM:           normal +	 * CAS latency:  4 Clocks +	 * BT:           sequential +	 * Burst length: 4 +	 */ +	ddr->sdram_mode = 0x439E0642; + +	/* DDR SDRAM Interval, 533MHz +	 * REFINT:  1040 Clocks +	 * BSTOPRE: 256 +	 */ +	ddr->sdram_interval = (1040 << 16) | 0x100; + +	/* +	 * workaround for erratum DD10 of MPC8458 family below rev. 2.0: +	 * DDR IO receiver must be set to an acceptable bias point by modifying +	 * a hidden register. +	 */ +	if (SVR_REV (get_svr ()) < 0x20) { +		gur->ddrioovcr = 0x90000000;	/* enable, VSEL 1.8V */ +	} + +	/* DDR SDRAM CFG 2 +	 * FRC_SR:      normal mode +	 * SR_IE:       no self-refresh interrupt +	 * DLL_RST_DIS: don't care, leave at reset value +	 * DQS_CFG:     differential DQS signals +	 * ODT_CFG:     assert ODT to internal IOs only during reads to DRAM +	 * LVWx_CFG:    don't care, leave at reset value +	 * NUM_PR:      1 refresh will be issued at a time +	 * DM_CFG:      don't care, leave at reset value +	 * D_INIT:      no data initialization +	 */ +	ddr->sdram_cfg_2 = 0x04401000; + +	/* DDR SDRAM MODE 2 +	 * MRS: Extended Mode Register 2 +	 */ +	ddr->sdram_mode_2 = 0x8000C000; + +	/* DDR SDRAM CLK CNTL +	 * CLK_ADJUST: 1/2 Clock 0x02000000 +	 * CLK_ADJUST: 5/8 Clock 0x02800000 +	 */ +	ddr->sdram_clk_cntl = 0x02800000; + +	/* wait for clock stabilization */ +	asm ("sync;isync;msync"); +	udelay(1000); + +	/* DDR SDRAM CLK CNTL +	 * MEM_EN:       enabled +	 * SREN:         don't care, leave at reset value +	 * ECC_EN:       no error report +	 * RD_EN:        no register DIMMs +	 * SDRAM_TYPE:   DDR2 +	 * DYN_PWR:      no power management +	 * 32_BE:        don't care, leave at reset value +	 * 8_BE:         4 beat burst +	 * NCAP:         don't care, leave at reset value +	 * 2T_EN:        1T Timing +	 * BA_INTLV_CTL: no interleaving +	 * x32_EN:       x16 organization +	 * PCHB8:        MA[10] for auto-precharge +	 * HSE:          half strength for single and 2-layer stacks +	 * (full strength for 3- and 4-layer stacks no yet considered) +	 * MEM_HALT:     no halt +	 * BI:           automatic initialization +	 */ +	ddr->sdram_cfg = 0x83000008; +	asm ("sync; isync; msync"); +	udelay(1000); + +#else /* !CONFIG_TQM8548 */  	switch (casl) {  	case 20:  		cfg_ddr_timing1 = 0x47405331 | (3 << 16); @@ -97,6 +228,7 @@ long int sdram_setup (int casl)  	ddr->sdram_cfg = 0xc2000000;		/* unbuffered,no DYN_PWR */  	asm ("sync; isync; msync");  	udelay (1000); +#endif /* CONFIG_TQM8548 */  	for (i = 0; i < N_DDR_CS_CONF; i++) {  		ddr->cs0_config = ddr_cs_conf[i].reg; @@ -108,11 +240,25 @@ long int sdram_setup (int casl)  			 */  			ddr->cs0_bnds = (ddr_cs_conf[i].size - 1) >> 24; -			return ddr_cs_conf[i].size; +			break;  		}  	} -	return 0;		/* nothing found !              */ +#ifdef CONFIG_TQM8548 +	if (i < N_DDR_CS_CONF) { +		/* Adjust refresh rate for DDR2 */ + +		ddr->timing_cfg_3 = ddr_cs_conf[i].refresh & 0x00070000; + +		ddr->timing_cfg_1 = (ddr->timing_cfg_1 & 0xFFFF0FFF) | +		    (ddr_cs_conf[i].refresh & 0x0000F000); + +		return ddr_cs_conf[i].size; +	} +#endif /* CONFIG_TQM8548 */ + +	/* return size if detected, else return 0 */ +	return (i < N_DDR_CS_CONF) ? ddr_cs_conf[i].size : 0;  }  void board_add_ram_info (int use_default) |