GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 05:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm: dra7xx: Add DDR related data for DRA752 ES1.0

Browse source 
DRA752 uses DDR3. Populating the corresponding structures
with DDR3 data.
Writing into MA registers if only MA is present in that soc.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: R Sricharan <r.sricharan@ti.com>
Reviewed-by: Tom Rini <trini@ti.com>
This commit is contained in:
Lokesh Vutla 2013-02-12 21:29:07 +00:00 • committed by Tom Rini
parent 8b12f1779e
commit 7831419d7b
5 changed files with 42 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/cpu/armv7/omap-common/emif-common.c
View file

@ -1191,7 +1191,7 @@ void dmm_init(u32 base)
writel(lisa_map_regs->dmm_lisa_map_0, writel(lisa_map_regs->dmm_lisa_map_0,
&hw_lisa_map_regs->dmm_lisa_map_0); &hw_lisa_map_regs->dmm_lisa_map_0);
if (omap_revision() >= OMAP4460_ES1_0) { if (lisa_map_regs->is_ma_present) {
hw_lisa_map_regs = hw_lisa_map_regs =
(struct dmm_lisa_map_regs *)MA_BASE; (struct dmm_lisa_map_regs *)MA_BASE;

18
arch/arm/cpu/armv7/omap4/sdram_elpida.c
View file

@ -94,14 +94,24 @@ const struct dmm_lisa_map_regs lisa_map_2G_x_1_x_2 = {
.dmm_lisa_map_0 = 0xFF020100, .dmm_lisa_map_0 = 0xFF020100,
.dmm_lisa_map_1 = 0, .dmm_lisa_map_1 = 0,
.dmm_lisa_map_2 = 0, .dmm_lisa_map_2 = 0,
.dmm_lisa_map_3 = 0x80540300 .dmm_lisa_map_3 = 0x80540300,
.is_ma_present = 0x0
}; };
const struct dmm_lisa_map_regs lisa_map_2G_x_2_x_2 = { const struct dmm_lisa_map_regs lisa_map_2G_x_2_x_2 = {
.dmm_lisa_map_0 = 0xFF020100, .dmm_lisa_map_0 = 0xFF020100,
.dmm_lisa_map_1 = 0, .dmm_lisa_map_1 = 0,
.dmm_lisa_map_2 = 0, .dmm_lisa_map_2 = 0,
.dmm_lisa_map_3 = 0x80640300 .dmm_lisa_map_3 = 0x80640300,
.is_ma_present = 0x0
};
const struct dmm_lisa_map_regs ma_lisa_map_2G_x_2_x_2 = {
.dmm_lisa_map_0 = 0xFF020100,
.dmm_lisa_map_1 = 0,
.dmm_lisa_map_2 = 0,
.dmm_lisa_map_3 = 0x80640300,
.is_ma_present = 0x1
}; };
static void emif_get_reg_dump_sdp(u32 emif_nr, const struct emif_regs **regs) static void emif_get_reg_dump_sdp(u32 emif_nr, const struct emif_regs **regs)
@ -126,8 +136,10 @@ static void emif_get_dmm_regs_sdp(const struct dmm_lisa_map_regs
if (omap_rev == OMAP4430_ES1_0) if (omap_rev == OMAP4430_ES1_0)
*dmm_lisa_regs = &lisa_map_2G_x_1_x_2; *dmm_lisa_regs = &lisa_map_2G_x_1_x_2;
else else if (omap_rev < OMAP4460_ES1_0)
*dmm_lisa_regs = &lisa_map_2G_x_2_x_2; *dmm_lisa_regs = &lisa_map_2G_x_2_x_2;
else
*dmm_lisa_regs = &ma_lisa_map_2G_x_2_x_2;
} }
void emif_get_dmm_regs(const struct dmm_lisa_map_regs **dmm_lisa_regs) void emif_get_dmm_regs(const struct dmm_lisa_map_regs **dmm_lisa_regs)

1
arch/arm/cpu/armv7/omap5/hw_data.c
View file

@ -586,6 +586,7 @@ void get_ioregs(const struct ctrl_ioregs **regs)
*regs = &ioregs_omap5432_es1; *regs = &ioregs_omap5432_es1;
break; break;
case OMAP5432_ES2_0: case OMAP5432_ES2_0:
case DRA752_ES1_0:
*regs = &ioregs_omap5432_es2; *regs = &ioregs_omap5432_es2;
break; break;

26
arch/arm/cpu/armv7/omap5/sdram.c
View file

@ -155,7 +155,16 @@ const struct dmm_lisa_map_regs lisa_map_4G_x_2_x_2 = {
.dmm_lisa_map_0 = 0x0, .dmm_lisa_map_0 = 0x0,
.dmm_lisa_map_1 = 0x0, .dmm_lisa_map_1 = 0x0,
.dmm_lisa_map_2 = 0x80740300, .dmm_lisa_map_2 = 0x80740300,
.dmm_lisa_map_3 = 0xFF020100 .dmm_lisa_map_3 = 0xFF020100,
.is_ma_present = 0x1
};
const struct dmm_lisa_map_regs lisa_map_512M_x_1 = {
.dmm_lisa_map_0 = 0x0,
.dmm_lisa_map_1 = 0x0,
.dmm_lisa_map_2 = 0x0,
.dmm_lisa_map_3 = 0x80500100,
.is_ma_present = 0x1
}; };
static void emif_get_reg_dump_sdp(u32 emif_nr, const struct emif_regs **regs) static void emif_get_reg_dump_sdp(u32 emif_nr, const struct emif_regs **regs)
@ -171,6 +180,7 @@ static void emif_get_reg_dump_sdp(u32 emif_nr, const struct emif_regs **regs)
*regs = &emif_regs_532_mhz_2cs_es2; *regs = &emif_regs_532_mhz_2cs_es2;
break; break;
case OMAP5432_ES2_0: case OMAP5432_ES2_0:
case DRA752_ES1_0:
default: default:
*regs = &emif_regs_ddr3_532_mhz_1cs_es2; *regs = &emif_regs_ddr3_532_mhz_1cs_es2;
} }
@ -182,7 +192,18 @@ void emif_get_reg_dump(u32 emif_nr, const struct emif_regs **regs)
static void emif_get_dmm_regs_sdp(const struct dmm_lisa_map_regs static void emif_get_dmm_regs_sdp(const struct dmm_lisa_map_regs
**dmm_lisa_regs) **dmm_lisa_regs)
{ {
*dmm_lisa_regs = &lisa_map_4G_x_2_x_2; switch (omap_revision()) {
case OMAP5430_ES1_0:
case OMAP5430_ES2_0:
case OMAP5432_ES1_0:
case OMAP5432_ES2_0:
*dmm_lisa_regs = &lisa_map_4G_x_2_x_2;
break;
case DRA752_ES1_0:
default:
*dmm_lisa_regs = &lisa_map_512M_x_1;
}
} }
void emif_get_dmm_regs(const struct dmm_lisa_map_regs **dmm_lisa_regs) void emif_get_dmm_regs(const struct dmm_lisa_map_regs **dmm_lisa_regs)
@ -297,6 +318,7 @@ static void emif_get_ext_phy_ctrl_const_regs(const u32 **regs)
*regs = ddr3_ext_phy_ctrl_const_base_es1; *regs = ddr3_ext_phy_ctrl_const_base_es1;
break; break;
case OMAP5432_ES2_0: case OMAP5432_ES2_0:
case DRA752_ES1_0:
default: default:
*regs = ddr3_ext_phy_ctrl_const_base_es2; *regs = ddr3_ext_phy_ctrl_const_base_es2;

1
arch/arm/include/asm/emif.h
View file

@ -697,6 +697,7 @@ struct dmm_lisa_map_regs {
u32 dmm_lisa_map_1; u32 dmm_lisa_map_1;
u32 dmm_lisa_map_2; u32 dmm_lisa_map_2;
u32 dmm_lisa_map_3; u32 dmm_lisa_map_3;
u8 is_ma_present;
}; };
#define CS0 0 #define CS0 0