From: Matus Ujhelyi Date: Mon, 5 Aug 2013 10:02:24 +0000 (+0200) Subject: ARM: OMAP2+: am33xx-restart: trigger warm reset on omap2+ boards X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=56cab60600af315b9cbe0be0990a3a86869101c4;p=linux-beck.git ARM: OMAP2+: am33xx-restart: trigger warm reset on omap2+ boards 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 Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/am33xx-restart.c b/arch/arm/mach-omap2/am33xx-restart.c index 1eae96212315..c88d8df753c2 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);