From: Lubomir Popov Date: Sun, 26 May 2013 10:03:17 +0000 (+0000) Subject: OMAP5: Fix bug in omap5_es1_prcm struct X-Git-Tag: v2013.07-rc1~2^2~3^2~23 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e0a8c99e6103a9052510ea9e2067c18cb688e1cb;p=oweals%2Fu-boot.git 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. Signed-off-by: Lubomir Popov Acked-by: Tom Rini --- diff --git a/arch/arm/cpu/armv7/omap5/prcm-regs.c b/arch/arm/cpu/armv7/omap5/prcm-regs.c index 6bff8ae12d..5010739024 100644 --- a/arch/arm/cpu/armv7/omap5/prcm-regs.c +++ b/arch/arm/cpu/armv7/omap5/prcm-regs.c @@ -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,