diff options
author | Joseph Lo <josephl@nvidia.com> | 2013-10-11 05:57:30 -0400 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2013-10-18 18:28:08 -0400 |
commit | 9997e62682e0fe68566c88f70ed320ded4e16529 (patch) | |
tree | 7a12aa21480b4b120c517339b63da7d8b9cf041c /arch | |
parent | 6ca91f9d640dae54307a8df19613e578e9c887c6 (diff) |
ARM: tegra: CPU hotplug support for Tegra124
The procedure of CPU hotplug for Tegra124 is same with Tegra114. We
re-use the same function with it.
Signed-off-by: Joseph Lo <josephl@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-tegra/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-tegra/hotplug.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index 97eb48e977e5..04ca2b3f34c1 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile | |||
@@ -35,5 +35,6 @@ obj-$(CONFIG_ARCH_TEGRA_114_SOC) += pm-tegra30.o | |||
35 | ifeq ($(CONFIG_CPU_IDLE),y) | 35 | ifeq ($(CONFIG_CPU_IDLE),y) |
36 | obj-$(CONFIG_ARCH_TEGRA_114_SOC) += cpuidle-tegra114.o | 36 | obj-$(CONFIG_ARCH_TEGRA_114_SOC) += cpuidle-tegra114.o |
37 | endif | 37 | endif |
38 | obj-$(CONFIG_ARCH_TEGRA_124_SOC) += sleep-tegra30.o | ||
38 | 39 | ||
39 | obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += board-paz00.o | 40 | obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += board-paz00.o |
diff --git a/arch/arm/mach-tegra/hotplug.c b/arch/arm/mach-tegra/hotplug.c index 04de2e860923..ff26af26bd0c 100644 --- a/arch/arm/mach-tegra/hotplug.c +++ b/arch/arm/mach-tegra/hotplug.c | |||
@@ -57,4 +57,6 @@ void __init tegra_hotplug_init(void) | |||
57 | tegra_hotplug_shutdown = tegra30_hotplug_shutdown; | 57 | tegra_hotplug_shutdown = tegra30_hotplug_shutdown; |
58 | if (IS_ENABLED(CONFIG_ARCH_TEGRA_114_SOC) && tegra_chip_id == TEGRA114) | 58 | if (IS_ENABLED(CONFIG_ARCH_TEGRA_114_SOC) && tegra_chip_id == TEGRA114) |
59 | tegra_hotplug_shutdown = tegra30_hotplug_shutdown; | 59 | tegra_hotplug_shutdown = tegra30_hotplug_shutdown; |
60 | if (IS_ENABLED(CONFIG_ARCH_TEGRA_124_SOC) && tegra_chip_id == TEGRA124) | ||
61 | tegra_hotplug_shutdown = tegra30_hotplug_shutdown; | ||
60 | } | 62 | } |