diff options
| author | Roger Ma <roma@nvidia.com> | 2014-05-19 13:08:56 +0800 |
|---|---|---|
| committer | Mandar Padmawar <mpadmawar@nvidia.com> | 2014-06-05 06:17:08 -0700 |
| commit | eec6881a3b2e98cb08923cac58d4df703e71b3ed (patch) | |
| tree | b581e01aa30902260fb9b8cf25226d99abe26d6e /arch/arm/mach-tegra/tegra11_soctherm.c | |
| parent | b2f0025c8609179b362529b883406cfecf8c9e5d (diff) | |
arm: tegra: soctherm: Update temp threshold with critical trip temp
Takes critical trip temp into hardware while updating temperature
UP/DN thresholds to ensure that SW shutsown is working at critical
trip temp with UART log of thermal shutdown even.
Bug 1492653
Change-Id: I10094c3d5ee32171197f792880b85bcdd519e7eb
Signed-off-by: Roger Ma <roma@nvidia.com>
(cherry picked from commit 5eaccbbc5c44b5e4c61e28de256e1e9be7e53b3b)
Reviewed-on: http://git-master/r/418481
Tested-by: Diwakar Tundlam <dtundlam@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/tegra11_soctherm.c')
| -rw-r--r-- | arch/arm/mach-tegra/tegra11_soctherm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/tegra11_soctherm.c b/arch/arm/mach-tegra/tegra11_soctherm.c index d92b09784d6a..2eababac4875 100644 --- a/arch/arm/mach-tegra/tegra11_soctherm.c +++ b/arch/arm/mach-tegra/tegra11_soctherm.c @@ -1115,8 +1115,7 @@ static void soctherm_update_zone(int zn) trips = cur_thz->trips; for (count = 0; count < trips; count++) { cur_thz->ops->get_trip_type(cur_thz, count, &trip_type); - if ((trip_type == THERMAL_TRIP_HOT) || - (trip_type == THERMAL_TRIP_CRITICAL)) + if (trip_type == THERMAL_TRIP_HOT) continue; /* handled in HW */ cur_thz->ops->get_trip_temp(cur_thz, count, &trip_temp); @@ -1129,7 +1128,7 @@ static void soctherm_update_zone(int zn) high_temp = trip_temp; } else { /* tripped? update low */ if (trip_type != THERMAL_TRIP_PASSIVE) { - /* get highest ACTIVE */ + /* get highest ACTIVE and CRITICAL*/ if (trip_temp > low_temp) low_temp = trip_temp; } else { |