brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-08-20 00:48:52 +09:00
Code Issues Projects Releases Wiki Activity

OMAP5: ddr: Change the ddr device name.

Browse Source 
The ddr part name used in OMAP5 ES1.0 soc is a SAMSUNG part and
not a ELPIDA part. So change this.

Signed-off-by: R Sricharan <r.sricharan@ti.com>
This commit is contained in:
SRICHARAN R 2012-03-12 02:25:45 +00:00 committed by Albert ARIBAUD
parent 7a4bf20930
commit 971f2ba21a
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/armv7/omap5/Makefile
View File

@ -28,7 +28,7 @@ LIB = $(obj)lib$(SOC).o
COBJS += hwinit.o COBJS += hwinit.o
COBJS += clocks.o COBJS += clocks.o
COBJS += emif.o COBJS += emif.o
COBJS += sdram_elpida.o COBJS += sdram.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS)) OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS))

30
arch/arm/cpu/armv7/omap5/sdram_elpida.c → arch/arm/cpu/armv7/omap5/sdram.c
View File

@ -1,5 +1,5 @@
/* /*
* Timing and Organization details of the Elpida parts used in OMAP5 * Timing and Organization details of the ddr device parts used in OMAP5
* EVM * EVM
* *
* (C) Copyright 2010 * (C) Copyright 2010
@ -48,7 +48,7 @@
*/ */
#ifdef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS #ifdef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
const struct emif_regs emif_regs_elpida_532_mhz_2cs = { const struct emif_regs emif_regs_532_mhz_2cs = {
.sdram_config_init = 0x80800EBA, .sdram_config_init = 0x80800EBA,
.sdram_config = 0x808022BA, .sdram_config = 0x808022BA,
.ref_ctrl = 0x0000081A, .ref_ctrl = 0x0000081A,
@ -67,7 +67,7 @@ const struct emif_regs emif_regs_elpida_532_mhz_2cs = {
.emif_ddr_ext_phy_ctrl_5 = 0x04010040 .emif_ddr_ext_phy_ctrl_5 = 0x04010040
}; };
const struct emif_regs emif_regs_elpida_266_mhz_2cs = { const struct emif_regs emif_regs_266_mhz_2cs = {
.sdram_config_init = 0x80800EBA, .sdram_config_init = 0x80800EBA,
.sdram_config = 0x808022BA, .sdram_config = 0x808022BA,
.ref_ctrl = 0x0000040D, .ref_ctrl = 0x0000040D,
@ -117,7 +117,7 @@ const u32 ext_phy_ctrl_const_base[EMIF_EXT_PHY_CTRL_CONST_REG] = {
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)
{ {
*regs = &emif_regs_elpida_532_mhz_2cs; *regs = &emif_regs_532_mhz_2cs;
} }
void emif_get_reg_dump(u32 emif_nr, const struct emif_regs **regs) void emif_get_reg_dump(u32 emif_nr, const struct emif_regs **regs)
__attribute__((weak, alias("emif_get_reg_dump_sdp"))); __attribute__((weak, alias("emif_get_reg_dump_sdp")));
@ -133,11 +133,11 @@ void emif_get_dmm_regs(const struct dmm_lisa_map_regs **dmm_lisa_regs)
#else #else
static const struct lpddr2_device_details elpida_4G_S4_details = { static const struct lpddr2_device_details dev_4G_S4_details = {
.type = LPDDR2_TYPE_S4, .type = LPDDR2_TYPE_S4,
.density = LPDDR2_DENSITY_4Gb, .density = LPDDR2_DENSITY_4Gb,
.io_width = LPDDR2_IO_WIDTH_32, .io_width = LPDDR2_IO_WIDTH_32,
.manufacturer = LPDDR2_MANUFACTURER_ELPIDA .manufacturer = LPDDR2_MANUFACTURER_SAMSUNG
}; };
static void emif_get_device_details_sdp(u32 emif_nr, static void emif_get_device_details_sdp(u32 emif_nr,
@ -145,8 +145,8 @@ static void emif_get_device_details_sdp(u32 emif_nr,
struct lpddr2_device_details *cs1_device_details) struct lpddr2_device_details *cs1_device_details)
{ {
/* EMIF1 & EMIF2 have identical configuration */ /* EMIF1 & EMIF2 have identical configuration */
*cs0_device_details = elpida_4G_S4_details; *cs0_device_details = dev_4G_S4_details;
*cs1_device_details = elpida_4G_S4_details; *cs1_device_details = dev_4G_S4_details;
} }
void emif_get_device_details(u32 emif_nr, void emif_get_device_details(u32 emif_nr,
@ -180,7 +180,7 @@ static const struct lpddr2_ac_timings timings_jedec_532_mhz = {
.tFAW = 50 .tFAW = 50
}; };
static const struct lpddr2_min_tck min_tck_elpida = { static const struct lpddr2_min_tck min_tck = {
.tRL = 3, .tRL = 3,
.tRP_AB = 3, .tRP_AB = 3,
.tRCD = 3, .tRCD = 3,
@ -195,13 +195,13 @@ static const struct lpddr2_min_tck min_tck_elpida = {
.tFAW = 8 .tFAW = 8
}; };
static const struct lpddr2_ac_timings *elpida_ac_timings[MAX_NUM_SPEEDBINS] = { static const struct lpddr2_ac_timings *ac_timings[MAX_NUM_SPEEDBINS] = {
&timings_jedec_532_mhz &timings_jedec_532_mhz
}; };
static const struct lpddr2_device_timings elpida_4G_S4_timings = { static const struct lpddr2_device_timings dev_4G_S4_timings = {
.ac_timings = elpida_ac_timings, .ac_timings = ac_timings,
.min_tck = &min_tck_elpida, .min_tck = &min_tck,
}; };
void emif_get_device_timings_sdp(u32 emif_nr, void emif_get_device_timings_sdp(u32 emif_nr,
@ -209,8 +209,8 @@ void emif_get_device_timings_sdp(u32 emif_nr,
const struct lpddr2_device_timings **cs1_device_timings) const struct lpddr2_device_timings **cs1_device_timings)
{ {
/* Identical devices on EMIF1 & EMIF2 */ /* Identical devices on EMIF1 & EMIF2 */
*cs0_device_timings = &elpida_4G_S4_timings; *cs0_device_timings = &dev_4G_S4_timings;
*cs1_device_timings = &elpida_4G_S4_timings; *cs1_device_timings = &dev_4G_S4_timings;
} }
void emif_get_device_timings(u32 emif_nr, void emif_get_device_timings(u32 emif_nr,