diff options
| author | Sai Charan Gurrappadi <sgurrappadi@nvidia.com> | 2012-06-22 16:18:02 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 12:32:12 -0700 |
| commit | 492231071f178099939426c3e9226b6f04a0a68b (patch) | |
| tree | a3869fec05c32ad11db9241f56cda7f274b4e513 /arch | |
| parent | c698fe135bb33851216ba818c3b33c95894f72ad (diff) | |
cpuquiet: Enable cpuquiet by default
Enable cpuquiet by default if autohotplug is enabled. Cpuquiet will now
replace autohotplug as the hotplugging infrastructure. The down_delay in
the balanced governor has also been increased to 2s from 500ms to match
a similar patch for autohotplug.
Change-Id: I36747af67c55547b3dee95f7d435f9ebc075d393
Signed-off-by: Sai Charan Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-on: http://git-master/r/123851
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Rebase-Id: R80c32cedfac36c7b342ca8dee58a5991e1d60439
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/Makefile | 14 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/cpuquiet.c | 2 |
3 files changed, 12 insertions, 8 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 1bce1d8baf2d..f89c81903212 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -258,9 +258,13 @@ config TEGRA_CLUSTER_CONTROL depends on ARCH_TEGRA_HAS_DUAL_CPU_CLUSTERS default y if PM_SLEEP +config TEGRA_CPUQUIET + bool + config TEGRA_AUTO_HOTPLUG bool "Enable automatic CPU hot-plugging" depends on HOTPLUG_CPU && CPU_FREQ && !ARCH_CPU_PROBE_RELEASE && !ARCH_TEGRA_2x_SOC + select TEGRA_CPUQUIET default y help This option enables turning CPUs off/on and switching tegra diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index be00a5de7491..e14c76aeed5a 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -37,13 +37,6 @@ endif ifeq ($(CONFIG_CPU_IDLE),y) obj-$(CONFIG_PM_SLEEP) += cpuidle-t3.o endif -ifeq ($(CONFIG_TEGRA_AUTO_HOTPLUG),y) -ifeq ($(CONFIG_CPUQUIET_FRAMEWORK),y) -obj-y += cpuquiet.o -else -obj-y += cpu-tegra3.o -endif -endif endif obj-y += pinmux.o @@ -100,6 +93,13 @@ obj-$(CONFIG_SMP) += platsmp.o obj-y += reset.o obj-y += headsmp.o obj-$(CONFIG_CPU_FREQ) += cpu-tegra.o +ifeq ($(CONFIG_TEGRA_AUTO_HOTPLUG),y) +ifeq ($(CONFIG_TEGRA_CPUQUIET),y) +obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += cpuquiet.o +else +obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += cpu-tegra3.o +endif +endif obj-$(CONFIG_TEGRA_PCI) += pcie.o obj-$(CONFIG_ARCH_TEGRA_11x_SOC) += tegra11_soctherm.o ifeq ($(CONFIG_TEGRA_THERMAL_THROTTLE),y) diff --git a/arch/arm/mach-tegra/cpuquiet.c b/arch/arm/mach-tegra/cpuquiet.c index 5a5b4bcbdf77..d82ff469bc28 100644 --- a/arch/arm/mach-tegra/cpuquiet.c +++ b/arch/arm/mach-tegra/cpuquiet.c @@ -37,7 +37,7 @@ #include "cpu-tegra.h" #include "clock.h" -#define INITIAL_STATE TEGRA_CPQ_IDLE +#define INITIAL_STATE TEGRA_CPQ_DISABLED #define UP_DELAY_MS 70 #define DOWN_DELAY_MS 2000 |