summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/edp.c
diff options
context:
space:
mode:
authorDiwakar Tundlam <dtundlam@nvidia.com>2013-04-23 13:57:10 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2013-09-14 13:09:45 -0700
commitbf9ca413a0f7329e587395a48b8c7251304573c5 (patch)
tree112b47143146c3ad5c3d57659970477f5d1ea22e /arch/arm/mach-tegra/edp.c
parente6e753432ec287d25cf36895a98f31446f039dec (diff)
ARM: tegra: apply volt-temp constraints only if non-zero
volt-temp constraints are defined clearly for T114. Until defined for T148, etc. they're not specified. Don't apply constraint if the field values are not specified (and left uninitialized). Bug 1270003 Bug 1270570 Change-Id: I1d273d9d9ec9985a3a94e489859714a708e4e5e8 Signed-off-by: Diwakar Tundlam <dtundlam@nvidia.com> Reviewed-on: http://git-master/r/222159 Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'arch/arm/mach-tegra/edp.c')
-rw-r--r--arch/arm/mach-tegra/edp.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/edp.c b/arch/arm/mach-tegra/edp.c
index 2558e52a4eaa..0dc8ae10af7f 100644
--- a/arch/arm/mach-tegra/edp.c
+++ b/arch/arm/mach-tegra/edp.c
@@ -380,6 +380,7 @@ static struct tegra_edp_cpu_leakage_params leakage_params[] = {
{ 0, -2416618, 11593, 62, },
},
},
+ /* .volt_temp_cap = { 70, 1240 }, - TODO for T148 */
},
};
#else
@@ -527,8 +528,10 @@ static unsigned int edp_calculate_maxf(
freq_KHz = freq_voltage_lut[f].freq / 1000;
voltage_mV = freq_voltage_lut[f].voltage_mV;
- /* Constrain Volt-Temp. Eg. at Tj >= 70C, no VDD_CPU > 1.24V */
- if (temp_C >= params->volt_temp_cap.temperature &&
+ /* Constrain Volt-Temp */
+ if (params->volt_temp_cap.temperature &&
+ temp_C > params->volt_temp_cap.temperature &&
+ params->volt_temp_cap.voltage_limit_mV &&
voltage_mV > params->volt_temp_cap.voltage_limit_mV)
continue;