From: Tony Lindgren Date: Thu, 29 Aug 2013 05:24:13 +0000 (-0700) Subject: ARM: OMAP2+: Add back the define for AM33XX_RST_GLOBAL_WARM_SW_MASK X-Git-Tag: upstream/snapshot3+hdmi~4407^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7323f219533e01cc075ba45a76f3e5b214adb23f;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 Signed-off-by: Olof Johansson --- diff --git a/arch/arm/mach-omap2/prm-regbits-33xx.h b/arch/arm/mach-omap2/prm-regbits-33xx.h index bbffc03..84feece 100644 --- a/arch/arm/mach-omap2/prm-regbits-33xx.h +++ b/arch/arm/mach-omap2/prm-regbits-33xx.h @@ -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)