| Message ID | 1458083357-31509-3-git-send-email-nm@ti.com |
|---|---|
| State | Accepted |
| Commit | 3d042e468a12b588a1cbbb5dbc67287545382124 |
| Delegated to: | Tom Rini |
| Headers | show |
On Tue, Mar 15, 2016 at 06:09:12PM -0500, Nishanth Menon wrote: > Based on data from EMIF configuration tool 1.1.1. Expected update for > CTRL_WKUP_EMIF1_SDRAM_CONFIG_EXT in the next revision of the tool has > been incorporated as well. > > Signed-off-by: Nishanth Menon <nm@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com>
On Tue, Mar 15, 2016 at 06:09:12PM -0500, Nishanth Menon wrote: > Based on data from EMIF configuration tool 1.1.1. Expected update for > CTRL_WKUP_EMIF1_SDRAM_CONFIG_EXT in the next revision of the tool has > been incorporated as well. > > Signed-off-by: Nishanth Menon <nm@ti.com> > Reviewed-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/cpu/armv7/omap5/hw_data.c b/arch/arm/cpu/armv7/omap5/hw_data.c index 93d1efbca17d..b69c0d13715a 100644 --- a/arch/arm/cpu/armv7/omap5/hw_data.c +++ b/arch/arm/cpu/armv7/omap5/hw_data.c @@ -743,6 +743,18 @@ const struct ctrl_ioregs ioregs_dra72x_es1 = { .ctrl_ddr_ctrl_ext_0 = 0xA2000000, }; +const struct ctrl_ioregs ioregs_dra72x_es2 = { + .ctrl_ddrch = 0x40404040, + .ctrl_lpddr2ch = 0x40404040, + .ctrl_ddr3ch = 0x60606060, + .ctrl_ddrio_0 = 0x00094A40, + .ctrl_ddrio_1 = 0x00000000, + .ctrl_ddrio_2 = 0x00000000, + .ctrl_emif_sdram_config_ext = 0x0001C1A7, + .ctrl_emif_sdram_config_ext_final = 0x0001C1A7, + .ctrl_ddr_ctrl_ext_0 = 0xA2000000, +}; + void __weak hw_data_init(void) { u32 omap_rev = omap_revision(); @@ -808,9 +820,11 @@ void get_ioregs(const struct ctrl_ioregs **regs) *regs = &ioregs_dra7xx_es1; break; case DRA722_ES1_0: - case DRA722_ES2_0: *regs = &ioregs_dra72x_es1; break; + case DRA722_ES2_0: + *regs = &ioregs_dra72x_es2; + break; default: printf("\n INVALID OMAP REVISION ");
Based on data from EMIF configuration tool 1.1.1. Expected update for CTRL_WKUP_EMIF1_SDRAM_CONFIG_EXT in the next revision of the tool has been incorporated as well. Signed-off-by: Nishanth Menon <nm@ti.com> --- arch/arm/cpu/armv7/omap5/hw_data.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)