diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-07-21 13:32:21 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2012-03-22 23:26:52 -0700 |
| commit | d31ffb77a20113eac5eee3194ee79a2d45454d33 (patch) | |
| tree | 550ef851056f3fb86ceec483e2385468825ec6dd /arch/arm/mach-tegra/sleep.h | |
| parent | e9a053ca70cc3540000619bbfcf8edc6a6e850e1 (diff) | |
ARM: tegra: Rename flow control registers
Change-Id: I2647718dc9c9420e57b24a810738c33ef05bcf61
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Rebase-Id: R6d5c6a52a2b0fd1dafd021d4a187528aeca26516
Diffstat (limited to 'arch/arm/mach-tegra/sleep.h')
| -rw-r--r-- | arch/arm/mach-tegra/sleep.h | 6 |
1 files changed, 3 insertions, 3 deletions
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) |