diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-07-21 13:32:21 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:46:50 -0800 |
| commit | 105756ca1eaa102747611f05df37a4bd83609933 (patch) | |
| tree | 5883476a1fca2dd57d5cc60cb8030f31c24d6557 | |
| parent | ab28f2bf97c63303879f52056824f47bfe1eca94 (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
| -rw-r--r-- | arch/arm/mach-tegra/sleep-t2.S | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/sleep.S | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/sleep.h | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/sleep-t2.S b/arch/arm/mach-tegra/sleep-t2.S index 8dc0f363caac..3e60064a3927 100644 --- a/arch/arm/mach-tegra/sleep-t2.S +++ b/arch/arm/mach-tegra/sleep-t2.S @@ -426,8 +426,8 @@ tegra2_enter_sleep: dsb mov32 r6, TEGRA_FLOW_CTRL_BASE - mov r0, #FLOW_CTRL_STOP_UNTIL_IRQ - orr r0, r0, #FLOW_CTRL_IRQ_RESUME | FLOW_CTRL_FIQ_RESUME + mov r0, #FLOW_CTRL_WAIT_FOR_INTERRUPT + orr r0, r0, #FLOW_CTRL_HALT_CPU_IRQ | FLOW_CTRL_HALT_CPU_FIQ cpu_id r1 cpu_to_halt_reg r1, r1 str r0, [r6, r1] diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S index 052233a4db4e..5b8a81b9a8e2 100644 --- a/arch/arm/mach-tegra/sleep.S +++ b/arch/arm/mach-tegra/sleep.S @@ -119,7 +119,7 @@ ENTRY(tegra_cpu_wfi) mov32 r0, TEGRA_FLOW_CTRL_VIRT mov r3, #FLOW_CTRL_CSR_INTR_FLAG | FLOW_CTRL_CSR_EVENT_FLAG str r3, [r0, r2] @ clear event & interrupt status - mov r3, #FLOW_CTRL_STOP_UNTIL_IRQ | FLOW_CTRL_JTAG_RESUME + mov r3, #FLOW_CTRL_WAIT_FOR_INTERRUPT | FLOW_CTRL_JTAG_RESUME str r3, [r0, r1] @ put flow controller in wait irq mode dsb wfi 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) |