mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-16 09:48:16 +00:00
66c98a0c38
KS2 ddr3 initialization uses ddr3_size global variable before u-boot relocation. Even if the variable is not being used after relocation, writing to it corrupts relocation table. This patch removes the global ddr3_size variable and uses local one instead. Signed-off-by: Vitaly Andrianov <vitalya@ti.com> Tested-by: Nishanth Menon <nm@ti.com>
53 lines
1.2 KiB
C
53 lines
1.2 KiB
C
/*
|
|
* Keystone2: DDR3 initialization
|
|
*
|
|
* (C) Copyright 2014
|
|
* Texas Instruments Incorporated, <www.ti.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include "ddr3_cfg.h"
|
|
#include <asm/arch/ddr3.h>
|
|
|
|
static struct pll_init_data ddr3_400 = DDR3_PLL_400;
|
|
|
|
u32 ddr3_init(void)
|
|
{
|
|
u32 ddr3_size;
|
|
char dimm_name[32];
|
|
|
|
if (~(readl(KS2_PLL_CNTRL_BASE + KS2_RSTCTRL_RSTYPE) & 0x1))
|
|
init_pll(&ddr3_400);
|
|
|
|
ddr3_get_dimm_params(dimm_name);
|
|
|
|
printf("Detected SO-DIMM [%s]\n", dimm_name);
|
|
|
|
/* Reset DDR3 PHY after PLL enabled */
|
|
ddr3_reset_ddrphy();
|
|
|
|
if (!strcmp(dimm_name, "18KSF1G72HZ-1G6E2 ")) {
|
|
/* 8G SO-DIMM */
|
|
ddr3_size = 8;
|
|
printf("DRAM: 8 GiB\n");
|
|
ddr3phy_1600_8g.zq0cr1 |= 0x10000;
|
|
ddr3phy_1600_8g.zq1cr1 |= 0x10000;
|
|
ddr3phy_1600_8g.zq2cr1 |= 0x10000;
|
|
ddr3_init_ddrphy(KS2_DDR3A_DDRPHYC, &ddr3phy_1600_8g);
|
|
ddr3_init_ddremif(KS2_DDR3A_EMIF_CTRL_BASE, &ddr3_1600_8g);
|
|
} else if (!strcmp(dimm_name, "18KSF51272HZ-1G6K2")) {
|
|
/* 4G SO-DIMM */
|
|
ddr3_size = 4;
|
|
printf("DRAM: 4 GiB\n");
|
|
ddr3_init_ddrphy(KS2_DDR3A_DDRPHYC, &ddr3phy_1600_4g);
|
|
ddr3_init_ddremif(KS2_DDR3A_EMIF_CTRL_BASE, &ddr3_1600_4g);
|
|
} else {
|
|
printf("Unknown SO-DIMM. Cannot configure DDR3\n");
|
|
while (1)
|
|
;
|
|
}
|
|
|
|
return ddr3_size;
|
|
}
|