diff options
| author | Matus Ujhelyi <ujhelyi.m@gmail.com> | 2013-08-05 12:02:24 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-08-21 10:01:30 +0200 |
| commit | 56cab60600af315b9cbe0be0990a3a86869101c4 (patch) | |
| tree | 6615a59e5ff15ed78bef0cbf9d7ae3f152100c40 | |
| parent | ARM: OMAP2: Use a consistent AM33XX SoC option description (diff) | |
| download | linux-56cab60600af315b9cbe0be0990a3a86869101c4.tar.xz linux-56cab60600af315b9cbe0be0990a3a86869101c4.zip | |
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 <ujhelyi.m@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/am33xx-restart.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |