GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-28 01:22:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm: mach-omap2: am33xx: Disable EMIF_DEVOFF immediately before hw leveling

Browse source 
In case of RTC+DDR resume, need to restore EMIF context
before initiating hardware leveling.

Signed-off-by: Brad Griffis <bgriffis@ti.com>
[j-keerthy@ti.com Fixed the am335x build issues]
Signed-off-by: Keerthy <j-keerthy@ti.com>
This commit is contained in:
Brad Griffis 2019-04-29 09:59:31 +05:30 • committed by Tom Rini
parent 6fe3e5ba66
commit 7b5774e4bd
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/mach-omap2/am33xx/board.c
View file

@ -481,9 +481,6 @@ static void rtc_only(void)
rtc_only_prcm_init(); rtc_only_prcm_init();
sdram_init(); sdram_init();
/* Disable EMIF_DEVOFF for normal operation and to exit self-refresh */
writel(0, &prm_device->emif_ctrl);
/* Check EMIF4D_SDRAM_CONFIG[31:29] SDRAM_TYPE */ /* Check EMIF4D_SDRAM_CONFIG[31:29] SDRAM_TYPE */
/* Only perform leveling if SDRAM_TYPE = 3 (DDR3) */ /* Only perform leveling if SDRAM_TYPE = 3 (DDR3) */
sdrc = readl(AM43XX_EMIF_BASE + AM43XX_SDRAM_CONFIG_OFFSET); sdrc = readl(AM43XX_EMIF_BASE + AM43XX_SDRAM_CONFIG_OFFSET);

14
arch/arm/mach-omap2/am33xx/ddr.c
View file

@ -80,6 +80,11 @@ static void configure_mr(int nr, u32 cs)
*/ */
void config_sdram_emif4d5(const struct emif_regs *regs, int nr) void config_sdram_emif4d5(const struct emif_regs *regs, int nr)
{ {
#ifdef CONFIG_AM43XX
struct prm_device_inst *prm_device =
(struct prm_device_inst *)PRM_DEVICE_INST;
#endif
writel(0xA0, &emif_reg[nr]->emif_pwr_mgmt_ctrl); writel(0xA0, &emif_reg[nr]->emif_pwr_mgmt_ctrl);
writel(0xA0, &emif_reg[nr]->emif_pwr_mgmt_ctrl_shdw); writel(0xA0, &emif_reg[nr]->emif_pwr_mgmt_ctrl_shdw);
writel(regs->zq_config, &emif_reg[nr]->emif_zq_config); writel(regs->zq_config, &emif_reg[nr]->emif_zq_config);
@ -126,6 +131,15 @@ void config_sdram_emif4d5(const struct emif_regs *regs, int nr)
writel(regs->ref_ctrl, &emif_reg[nr]->emif_sdram_ref_ctrl); writel(regs->ref_ctrl, &emif_reg[nr]->emif_sdram_ref_ctrl);
writel(regs->ref_ctrl, &emif_reg[nr]->emif_sdram_ref_ctrl_shdw); writel(regs->ref_ctrl, &emif_reg[nr]->emif_sdram_ref_ctrl_shdw);
#ifdef CONFIG_AM43XX
/*
* Disable EMIF_DEVOFF
* -> Cold Boot: This is just rewriting the default register value.
* -> RTC Resume: Must disable DEVOFF before leveling.
*/
writel(0, &prm_device->emif_ctrl);
#endif
/* Perform hardware leveling for DDR3 */ /* Perform hardware leveling for DDR3 */
if (emif_sdram_type(regs->sdram_config) == EMIF_SDRAM_TYPE_DDR3) { if (emif_sdram_type(regs->sdram_config) == EMIF_SDRAM_TYPE_DDR3) {
writel(readl(&emif_reg[nr]->emif_ddr_ext_phy_ctrl_36) | writel(readl(&emif_reg[nr]->emif_ddr_ext_phy_ctrl_36) |