From 105756ca1eaa102747611f05df37a4bd83609933 Mon Sep 17 00:00:00 2001 From: Scott Williams Date: Thu, 21 Jul 2011 13:32:21 -0700 Subject: ARM: tegra: Rename flow control registers Change-Id: I2647718dc9c9420e57b24a810738c33ef05bcf61 Signed-off-by: Scott Williams DW: Split into logical changes Signed-off-by: Dan Willemsen Rebase-Id: R6d5c6a52a2b0fd1dafd021d4a187528aeca26516 --- arch/arm/mach-tegra/sleep.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'arch/arm/mach-tegra/sleep.h') diff --git a/arch/arm/mach-tegra/sleep.h b/arch/arm/mach-tegra/sleep.h index 34cffd17ff0b..2332e6f2c574 100644 --- a/arch/arm/mach-tegra/sleep.h +++ b/arch/arm/mach-tegra/sleep.h @@ -40,10 +40,10 @@ #define CPU_NOT_RESETTABLE 0 #define FLOW_CTRL_WAITEVENT (2 << 29) -#define FLOW_CTRL_STOP_UNTIL_IRQ (4 << 29) +#define FLOW_CTRL_WAIT_FOR_INTERRUPT (4 << 29) #define FLOW_CTRL_JTAG_RESUME (1 << 28) -#define FLOW_CTRL_IRQ_RESUME (1 << 10) -#define FLOW_CTRL_FIQ_RESUME (1 << 8) +#define FLOW_CTRL_HALT_CPU_IRQ (1 << 10) +#define FLOW_CTRL_HALT_CPU_FIQ (1 << 8) #define FLOW_CTRL_CSR_INTR_FLAG (1<<15) #define FLOW_CTRL_CSR_EVENT_FLAG (1<<14) -- cgit v1.2.3