diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2012-09-07 23:07:53 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 12:09:20 -0700 |
| commit | 9f1ab7af88fe9858c3c90eef44b0cc62b98c264e (patch) | |
| tree | bfd65d9b25ef6054d37d073bc9f545bdda17ab79 /arch/arm/mach-tegra/sleep.S | |
| parent | 794fa47369dbc7670cef5dc6c3d9057ccc0797a6 (diff) | |
unknown changes from android-tegra-nv-3.4
Rebase-Id: R940fad74c7e91ef3d1d3d589a48064ccb7335541
Diffstat (limited to 'arch/arm/mach-tegra/sleep.S')
| -rw-r--r-- | arch/arm/mach-tegra/sleep.S | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S index 5a5467a3e1e0..56006d716267 100644 --- a/arch/arm/mach-tegra/sleep.S +++ b/arch/arm/mach-tegra/sleep.S @@ -28,7 +28,6 @@ #include <asm/assembler.h> #include <asm/cache.h> -#include <asm/cp15.h> #include <asm/domain.h> #include <asm/memory.h> #include <asm/page.h> @@ -36,18 +35,21 @@ #include <asm/asm-offsets.h> #include <asm/glue-cache.h> #include <asm/glue-proc.h> -#include <asm/barrier.h> +#include <asm/cp15.h> #include "iomap.h" -#include "flowctrl.h" #include "sleep.h" +#include "flowctrl.h" #define CLK_RESET_CCLK_BURST 0x20 #define CLK_RESET_CCLK_DIVIDER 0x24 #define TEGRA_PMC_VIRT (TEGRA_PMC_BASE - IO_APB_PHYS + IO_APB_VIRT) +#define TEGRA_FLOW_CTRL_VIRT (TEGRA_FLOW_CTRL_BASE - IO_PPSB_PHYS \ + + IO_PPSB_VIRT) + /* * tegra_pen_lock * @@ -102,6 +104,7 @@ ENTRY(tegra_pen_unlock) mov pc, lr ENDPROC(tegra_pen_unlock) + /* * tegra_cpu_exit_coherency * |