Skip to contentSkip to conversation

am33xx-restart: trigger warm reset on omap2+ boards

PATCH New ujhelyi.m at gmail.com 2 participants 2 messages Aug 5, 2013 – Aug 21, 2013

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

ujhelyi.m at gmail.com

author
#0 lore raw

PATCH 1/1 am33xx-restart: trigger warm reset on omap2+ boards

From: Matus Ujhelyi <[email protected]>

Currently the cold reset was triggered. It happened due to oposite offsets of cold/warm flags in PRM_RSTST and PRM_RSTCTRL registers.

Signed-off-by Matus Ujhelyi <[email protected]>
---
 arch/arm/mach-omap2/am33xx-restart.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/am33xx-restart.c +2 -2
index 1eae962..c88d8df7 100644
@@ -24,8 +24,8 @@ void am33xx_restart(enum reboot_mode mode, const char *cmd)
 {
 	/* TODO: Handle mode and cmd if necessary */
 
-	am33xx_prm_rmw_reg_bits(AM33XX_GLOBAL_WARM_SW_RST_MASK,
-				AM33XX_GLOBAL_WARM_SW_RST_MASK,
+	am33xx_prm_rmw_reg_bits(AM33XX_RST_GLOBAL_WARM_SW_MASK,
+				AM33XX_RST_GLOBAL_WARM_SW_MASK,
 				AM33XX_PRM_DEVICE_MOD,
 				AM33XX_PRM_RSTCTRL_OFFSET);
Signature · 1 line
1.7.9.5
maintainer
#1 lore raw

PATCH 1/1 am33xx-restart: trigger warm reset on omap2+ boards

Quoted 4 lines · ujhelyi.m at gmail.com

From: Matus Ujhelyi <[email protected]>

Currently the cold reset was triggered. It happened due to oposite offsets of cold/warm flags in PRM_RSTST and PRM_RSTCTRL registers.

Thanks applying into omap-for-v3.12/fixes-non-critical.

Tony

Quoted 23 lines
Signed-off-by Matus Ujhelyi <[email protected]>
---
 arch/arm/mach-omap2/am33xx-restart.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/am33xx-restart.c +2 -2
index 1eae962..c88d8df7 100644
@@ -24,8 +24,8 @@ void am33xx_restart(enum reboot_mode mode, const char *cmd)
 {
 	/* TODO: Handle mode and cmd if necessary */
 
-	am33xx_prm_rmw_reg_bits(AM33XX_GLOBAL_WARM_SW_RST_MASK,
-				AM33XX_GLOBAL_WARM_SW_RST_MASK,
+	am33xx_prm_rmw_reg_bits(AM33XX_RST_GLOBAL_WARM_SW_MASK,
+				AM33XX_RST_GLOBAL_WARM_SW_MASK,
 				AM33XX_PRM_DEVICE_MOD,
 				AM33XX_PRM_RSTCTRL_OFFSET);
Signature · 1 line
1.7.9.5