diff options
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-tegra/Makefile | 3 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/sleep-t20.S | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/sleep.S | 5 |
3 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index 1357f386bf32..82c5597624ea 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -23,11 +23,12 @@ obj-y += powergate.o obj-y += apbio.o ifeq ($(CONFIG_CPU_IDLE),y) obj-y += cpuidle.o -obj-y += sleep.o ifeq ($(CONFIG_PM_SLEEP),y) obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += cpuidle-t2.o endif endif +obj-y += sleep.o +obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += sleep-t2.o obj-y += mc.o obj-$(CONFIG_USB_SUPPORT) += usb_phy.o obj-$(CONFIG_FIQ) += fiq.o diff --git a/arch/arm/mach-tegra/sleep-t20.S b/arch/arm/mach-tegra/sleep-t20.S index 15d960800070..f7f119cbb325 100644 --- a/arch/arm/mach-tegra/sleep-t20.S +++ b/arch/arm/mach-tegra/sleep-t20.S @@ -77,6 +77,7 @@ ENTRY(tegra20_hotplug_shutdown) mov pc, lr @ should never get here ENDPROC(tegra20_hotplug_shutdown) +#if defined(CONFIG_PM_SLEEP) /* * tegra20_cpu_shutdown(int cpu) * @@ -513,3 +514,4 @@ tegra2_sdram_pad_save: .globl tegra2_iram_end tegra2_iram_end: b . +#endif diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S index 97fa48e02584..ccbfd2de0448 100644 --- a/arch/arm/mach-tegra/sleep.S +++ b/arch/arm/mach-tegra/sleep.S @@ -101,6 +101,7 @@ ENTRY(tegra_pen_unlock) mov pc, lr ENDPROC(tegra_pen_unlock) +#ifdef CONFIG_PM_SLEEP /* * tegra_cpu_save * @@ -144,8 +145,6 @@ ENTRY(tegra_cpu_save) mov pc, lr ENDPROC(tegra_cpu_save) -.word - /* * tegra_sleep_cpu(unsigned long v2p) * @@ -255,4 +254,4 @@ ENTRY(tegra_cpu_pllp) str r0, [r5, #CLK_RESET_CCLK_DIVIDER] mov pc, lr ENDPROC(tegra_cpu_pllp) - +#endif |