diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-08-29 01:24:13 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-29 22:10:59 -0400 |
| commit | 7323f219533e01cc075ba45a76f3e5b214adb23f (patch) | |
| tree | fcd688d629997af5422818f4d6ceb2515bdfffb5 /arch/arm | |
| parent | d5db40a775d823d9c05e281aa43b23667e8f867a (diff) | |
ARM: OMAP2+: Add back the define for AM33XX_RST_GLOBAL_WARM_SW_MASK
This is needed to prevent a build error with a patch queued for fixes
"ARM: OMAP2+: am33xx-restart: trigger warm reset on omap2+ boards".
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/prm-regbits-33xx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/prm-regbits-33xx.h b/arch/arm/mach-omap2/prm-regbits-33xx.h index bbffc03c595f..84feecee4fe6 100644 --- a/arch/arm/mach-omap2/prm-regbits-33xx.h +++ b/arch/arm/mach-omap2/prm-regbits-33xx.h | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #define AM33XX_GFX_MEM_RETSTATE_MASK (1 << 6) | 22 | #define AM33XX_GFX_MEM_RETSTATE_MASK (1 << 6) |
| 23 | #define AM33XX_GFX_MEM_STATEST_MASK (0x3 << 4) | 23 | #define AM33XX_GFX_MEM_STATEST_MASK (0x3 << 4) |
| 24 | #define AM33XX_GLOBAL_WARM_SW_RST_MASK (1 << 1) | 24 | #define AM33XX_GLOBAL_WARM_SW_RST_MASK (1 << 1) |
| 25 | #define AM33XX_RST_GLOBAL_WARM_SW_MASK (1 << 0) | ||
| 25 | #define AM33XX_PRUSS_MEM_ONSTATE_MASK (0x3 << 5) | 26 | #define AM33XX_PRUSS_MEM_ONSTATE_MASK (0x3 << 5) |
| 26 | #define AM33XX_PRUSS_MEM_RETSTATE_MASK (1 << 7) | 27 | #define AM33XX_PRUSS_MEM_RETSTATE_MASK (1 << 7) |
| 27 | #define AM33XX_PRUSS_MEM_STATEST_MASK (0x3 << 23) | 28 | #define AM33XX_PRUSS_MEM_STATEST_MASK (0x3 << 23) |