diff options
| author | Sai Gurrappadi <sgurrappadi@nvidia.com> | 2013-11-12 17:37:58 -0800 |
|---|---|---|
| committer | Diwakar Tundlam <dtundlam@nvidia.com> | 2013-11-19 16:04:52 -0800 |
| commit | 68ff8bbe8b27740448a9103607e952aad4836a0f (patch) | |
| tree | 9bd1c2b5d6ffda5031faf982ec7f9d8cf0807c91 /arch/arm/mach-tegra/tegra12_dvfs.c | |
| parent | cf69310ba4017d916eb4d7ff3cf5c1103249c9d2 (diff) | |
ARM: tegra12: dvfs: Disable vmax thermal profile
Disable the vmax thermal profile in dvfs if the cpu voltage cap module
exists as it will do the vdd_cpu vmax capping.
Bug 1349095
Change-Id: Ica211c7a68f6595038dd922ca49e6111cf0e4a81
Signed-off-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-on: http://git-master/r/329934
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>
Tested-by: Diwakar Tundlam <dtundlam@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/tegra12_dvfs.c')
| -rw-r--r-- | arch/arm/mach-tegra/tegra12_dvfs.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/tegra12_dvfs.c b/arch/arm/mach-tegra/tegra12_dvfs.c index 7234f37e80c5..56052e63abe3 100644 --- a/arch/arm/mach-tegra/tegra12_dvfs.c +++ b/arch/arm/mach-tegra/tegra12_dvfs.c @@ -45,12 +45,14 @@ static bool tegra_dvfs_gpu_disabled; static int vdd_core_therm_trips_table[MAX_THERMAL_LIMITS] = { 20, }; static int vdd_core_therm_floors_table[MAX_THERMAL_LIMITS] = { 900, }; +#ifndef CONFIG_TEGRA_CPU_VOLT_CAP static int vdd_cpu_vmax_trips_table[MAX_THERMAL_LIMITS] = { 62, 72, 82, }; static int vdd_cpu_therm_caps_table[MAX_THERMAL_LIMITS] = { 1230, 1210, 1180, }; static struct tegra_cooling_device cpu_vmax_cdev = { .cdev_type = "cpu_hot", }; +#endif static struct tegra_cooling_device cpu_vmin_cdev = { .cdev_type = "cpu_cold", @@ -75,7 +77,9 @@ static struct dvfs_rail tegra12_dvfs_rail_vdd_cpu = { .step = VDD_SAFE_STEP, .jmp_to_zero = true, .vmin_cdev = &cpu_vmin_cdev, +#ifndef CONFIG_TEGRA_CPU_VOLT_CAP .vmax_cdev = &cpu_vmax_cdev, +#endif .alignment = { .step_uv = 10000, /* 10mV */ }, @@ -680,9 +684,11 @@ static int __init set_cpu_dvfs_data(unsigned long max_freq, &tegra12_dvfs_rail_vdd_cpu, &cpu_dvfs->dfll_data); /* Init cpu thermal caps */ +#ifndef CONFIG_TEGRA_CPU_VOLT_CAP tegra_dvfs_rail_init_vmax_thermal_profile( vdd_cpu_vmax_trips_table, vdd_cpu_therm_caps_table, &tegra12_dvfs_rail_vdd_cpu, &cpu_dvfs->dfll_data); +#endif return 0; } |