]> Pileus Git - ~andy/linux/commitdiff
ARM: OMAP2+: Add back the define for AM33XX_RST_GLOBAL_WARM_SW_MASK
authorTony Lindgren <tony@atomide.com>
Thu, 29 Aug 2013 05:24:13 +0000 (22:24 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 30 Aug 2013 02:10:59 +0000 (19:10 -0700)
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>
arch/arm/mach-omap2/prm-regbits-33xx.h

index bbffc03c595fc5ca09beb13660239f58eabf16cf..84feecee4fe673ffbb9a91140ea34639c3141766 100644 (file)
@@ -22,6 +22,7 @@
 #define AM33XX_GFX_MEM_RETSTATE_MASK                   (1 << 6)
 #define AM33XX_GFX_MEM_STATEST_MASK                    (0x3 << 4)
 #define AM33XX_GLOBAL_WARM_SW_RST_MASK                 (1 << 1)
+#define AM33XX_RST_GLOBAL_WARM_SW_MASK                 (1 << 0)
 #define AM33XX_PRUSS_MEM_ONSTATE_MASK                  (0x3 << 5)
 #define AM33XX_PRUSS_MEM_RETSTATE_MASK                 (1 << 7)
 #define AM33XX_PRUSS_MEM_STATEST_MASK                  (0x3 << 23)