From: Nishanth Menon <nm@ti.com>
Date: Tue, 15 Mar 2016 23:09:12 +0000 (-0500)
Subject: ARM: DRA7: hwdata: Update ioreg data for DRA72 SR2.0
X-Git-Tag: v2016.05-rc1~166
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3d042e468a12b588a1cbbb5dbc67287545382124;p=oweals%2Fu-boot.git

ARM: DRA7: hwdata: Update ioreg data for DRA72 SR2.0

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>
---

diff --git a/arch/arm/cpu/armv7/omap5/hw_data.c b/arch/arm/cpu/armv7/omap5/hw_data.c
index 93d1efbca1..b69c0d1371 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 ");