Skip to contentSkip to conversation

OMAP5: Fix bug in omap5_es1_prcm struct

PATCH Superseded Lubomir Popov 2 participants 3 messages May 26, 2013 – Jun 6, 2013 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 OMAP5: Fix bug in omap5_es1_prcm struct

The newly introduced function setup_warmreset_time(), called from within prcm_init(), tries to write to the prm_rsttime OMAP5 register. The struct member holding this register's address is however initialized for OMAP5 ES2.0 only. On ES1.0 devices this uninitialized value causes a second (warm) reset at startup.

Add .prm_rsttime address init to the ES1.0 struct.

---
V2 gives the correct prm_rsttime reg address for ES1.0. Copy-paste from ES2.0 in V1, sorry.

 arch/arm/cpu/armv7/omap5/prcm-regs.c | 1 +
 1 file changed, 1 insertion(+)
arch/arm/cpu/armv7/omap5/prcm-regs.c +1 -0
index e9f6a32..f29ac77 100644
@@ -298,6 +298,7 @@ struct prcm_regs const omap5_es1_prcm = {
 	.cm_wkupaon_io_srcomp_clkctrl = 0x4ae07898,
 	.prm_rstctrl = 0x4ae07b00,
 	.prm_rstst = 0x4ae07b04,
+	.prm_rsttime = 0x4ae07b08,
 	.prm_vc_val_bypass = 0x4ae07ba0,
 	.prm_vc_cfg_i2c_mode = 0x4ae07bb4,
 	.prm_vc_cfg_i2c_clk = 0x4ae07bb8,
Signature · 1 line
1.7.12.4 (Apple Git-37)
#1 lore raw

PATCH v2 1/1 OMAP5: Fix bug in omap5_es1_prcm struct

Quoted 10 lines · Lubomir Popov

The newly introduced function setup_warmreset_time(), called from within prcm_init(), tries to write to the prm_rsttime OMAP5 register. The struct member holding this register's address is however initialized for OMAP5 ES2.0 only. On ES1.0 devices this uninitialized value causes a second (warm) reset at startup.

Add .prm_rsttime address init to the ES1.0 struct.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130528/2834255d/attachment.pgp>
#2 lore raw

PATCH v2 1/1 OMAP5: Fix bug in omap5_es1_prcm struct

In reply to Lubomir Popov

Hi Tom,

Quoted 23 lines · Lubomir Popov

The newly introduced function setup_warmreset_time(), called from within prcm_init(), tries to write to the prm_rsttime OMAP5 register. The struct member holding this register's address is however initialized for OMAP5 ES2.0 only. On ES1.0 devices this uninitialized value causes a second (warm) reset at startup.

Add .prm_rsttime address init to the ES1.0 struct.

---
V2 gives the correct prm_rsttime reg address for ES1.0. Copy-paste from ES2.0 in V1, sorry.

 arch/arm/cpu/armv7/omap5/prcm-regs.c | 1 +
 1 file changed, 1 insertion(+)
arch/arm/cpu/armv7/omap5/prcm-regs.c +0 -0
index e9f6a32..f29ac77 100644

arch/arm/cpu/armv7/omap5/prcm-regs.c struct prcm_regs const omap5_es1_prcm = { · line 304

Quoted 7 lines
arch/arm/cpu/armv7/omap5/prcm-regs.c +1 -0
@@ -298,6 +298,7 @@ struct prcm_regs const omap5_es1_prcm = {
 	.cm_wkupaon_io_srcomp_clkctrl = 0x4ae07898,
 	.prm_rstctrl = 0x4ae07b00,
 	.prm_rstst = 0x4ae07b04,
+	.prm_rsttime = 0x4ae07b08,
 	.prm_vc_val_bypass = 0x4ae07ba0,
 	.prm_vc_cfg_i2c_mode = 0x4ae07bb4,
 	.prm_vc_cfg_i2c_clk = 0x4ae07bb8,

Could you please apply http://patchwork.ozlabs.org/patch/246454/
to the ti tree? This is the only obstacle for my board to boot normally with a clean u-boot-ti in respect to the OMAP5 common stuff.

Thanks,
Lubo