Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: tegra: Compile sleep-tegra20/30.S unconditionally

The sleep-tegra*.S provides functionality required for suspend/resume
and CPU hotplugging. The new unified CPUIDLE driver will support multiple
hardware generations starting from Terga20 and ending with Tegra124, the
driver will utilize functions that are provided by the assembly and thus
it is cleaner to compile that code without any build-dependencies in order
to avoid churning with #ifdef's.

Acked-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Tested-by: Peter Geis <pgwipeout@gmail.com>
Tested-by: Jasper Korten <jja2000@gmail.com>
Tested-by: David Heidelberg <david@ixit.cz>
Tested-by: Nicolas Chauvet <kwizart@gmail.com>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

authored by

Dmitry Osipenko and committed by
Thierry Reding
df25e554 bb6d3fb3

+2 -6
+2 -4
arch/arm/mach-tegra/Makefile
··· 8 8 obj-y += reset-handler.o 9 9 obj-y += sleep.o 10 10 obj-y += tegra.o 11 + obj-y += sleep-tegra20.o 12 + obj-y += sleep-tegra30.o 11 13 obj-$(CONFIG_CPU_IDLE) += cpuidle.o 12 - obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += sleep-tegra20.o 13 14 obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += pm-tegra20.o 14 15 ifeq ($(CONFIG_CPU_IDLE),y) 15 16 obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += cpuidle-tegra20.o 16 17 endif 17 - obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += sleep-tegra30.o 18 18 obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += pm-tegra30.o 19 19 ifeq ($(CONFIG_CPU_IDLE),y) 20 20 obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += cpuidle-tegra30.o ··· 22 22 obj-$(CONFIG_SMP) += platsmp.o 23 23 obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o 24 24 25 - obj-$(CONFIG_ARCH_TEGRA_114_SOC) += sleep-tegra30.o 26 25 obj-$(CONFIG_ARCH_TEGRA_114_SOC) += pm-tegra30.o 27 26 ifeq ($(CONFIG_CPU_IDLE),y) 28 27 obj-$(CONFIG_ARCH_TEGRA_114_SOC) += cpuidle-tegra114.o 29 28 endif 30 - obj-$(CONFIG_ARCH_TEGRA_124_SOC) += sleep-tegra30.o 31 29 obj-$(CONFIG_ARCH_TEGRA_124_SOC) += pm-tegra30.o 32 30 ifeq ($(CONFIG_CPU_IDLE),y) 33 31 obj-$(CONFIG_ARCH_TEGRA_124_SOC) += cpuidle-tegra114.o
-2
arch/arm/mach-tegra/sleep.h
··· 120 120 int tegra_sleep_cpu_finish(unsigned long); 121 121 void tegra_disable_clean_inv_dcache(u32 flag); 122 122 123 - #ifdef CONFIG_HOTPLUG_CPU 124 123 void tegra20_hotplug_shutdown(void); 125 124 void tegra30_hotplug_shutdown(void); 126 - #endif 127 125 128 126 void tegra20_cpu_shutdown(int cpu); 129 127 int tegra20_cpu_is_resettable_soon(void);