linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] am33xx-restart: trigger warm reset on omap2+ boards
@ 2013-08-05 10:02 ujhelyi.m at gmail.com
  2013-08-21  8:02 ` Tony Lindgren
  0 siblings, 1 reply; 2+ messages in thread
From: ujhelyi.m at gmail.com @ 2013-08-05 10:02 UTC (permalink / raw)
  To: linux-arm-kernel

From: Matus Ujhelyi <ujhelyi.m@gmail.com>

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 <ujhelyi.m@gmail.com>
---
 arch/arm/mach-omap2/am33xx-restart.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/am33xx-restart.c b/arch/arm/mach-omap2/am33xx-restart.c
index 1eae962..c88d8df7 100644
--- a/arch/arm/mach-omap2/am33xx-restart.c
+++ b/arch/arm/mach-omap2/am33xx-restart.c
@@ -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);
 
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [PATCH] am33xx-restart: trigger warm reset on omap2+ boards
  2013-08-05 10:02 [PATCH] am33xx-restart: trigger warm reset on omap2+ boards ujhelyi.m at gmail.com
@ 2013-08-21  8:02 ` Tony Lindgren
  0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2013-08-21  8:02 UTC (permalink / raw)
  To: linux-arm-kernel

* ujhelyi.m at gmail.com <ujhelyi.m@gmail.com> [130805 03:09]:
> From: Matus Ujhelyi <ujhelyi.m@gmail.com>
> 
> 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
 
> Signed-off-by: Matus Ujhelyi <ujhelyi.m@gmail.com>
> ---
>  arch/arm/mach-omap2/am33xx-restart.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/am33xx-restart.c b/arch/arm/mach-omap2/am33xx-restart.c
> index 1eae962..c88d8df7 100644
> --- a/arch/arm/mach-omap2/am33xx-restart.c
> +++ b/arch/arm/mach-omap2/am33xx-restart.c
> @@ -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);
>  
> -- 
> 1.7.9.5
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-08-21  8:02 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-05 10:02 [PATCH] am33xx-restart: trigger warm reset on omap2+ boards ujhelyi.m at gmail.com
2013-08-21  8:02 ` Tony Lindgren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).