summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-dalmore-power.c
diff options
context:
space:
mode:
authorDiwakar Tundlam <dtundlam@nvidia.com>2013-01-29 16:44:32 -0800
committerMandar Padmawar <mpadmawar@nvidia.com>2013-01-31 02:38:42 -0800
commit2af79db3c5763d3a0b6e78663ccf1ad6c04be134 (patch)
tree13451b517f436a86d9a189311daa590e55d59c46 /arch/arm/mach-tegra/board-dalmore-power.c
parentc98308fd66c980a4f171f10faf24486895c660c8 (diff)
arm: tegra: Move all tj dependent thermals from nct to soc_therm
Functions moved are vdd_cpu, core edp. Raised shutdown limit for nct. Added two higher temps for cpu_edp to support higher soc_therm temps. Doing this only for Dalmore and Pluto. No real changes to Roth. Bug 1200075 Change-Id: I2b4ac4ba7cd933bd47c30ab2ad9eabb3a3da5fbe Signed-off-by: Diwakar Tundlam <dtundlam@nvidia.com> Reviewed-on: http://git-master/r/195331 Reviewed-by: Mandar Padmawar <mpadmawar@nvidia.com> Tested-by: Mandar Padmawar <mpadmawar@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-dalmore-power.c')
-rw-r--r--arch/arm/mach-tegra/board-dalmore-power.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-dalmore-power.c b/arch/arm/mach-tegra/board-dalmore-power.c
index a706be850161..20cb8961da65 100644
--- a/arch/arm/mach-tegra/board-dalmore-power.c
+++ b/arch/arm/mach-tegra/board-dalmore-power.c
@@ -48,6 +48,7 @@
#include "tegra-board-id.h"
#include "board.h"
#include "gpio-names.h"
+#include "board-common.h"
#include "board-dalmore.h"
#include "tegra_cl_dvfs.h"
#include "devices.h"
@@ -1184,21 +1185,21 @@ static struct soctherm_platform_data dalmore_soctherm_data = {
.trips = {
{
.cdev_type = "tegra-balanced",
- .trip_temp = 85000,
+ .trip_temp = 84000,
.trip_type = THERMAL_TRIP_PASSIVE,
.upper = THERMAL_NO_LIMIT,
.lower = THERMAL_NO_LIMIT,
},
{
.cdev_type = "tegra-heavy",
- .trip_temp = 95000,
+ .trip_temp = 94000,
.trip_type = THERMAL_TRIP_HOT,
.upper = THERMAL_NO_LIMIT,
.lower = THERMAL_NO_LIMIT,
},
{
.cdev_type = "tegra-shutdown",
- .trip_temp = 105000,
+ .trip_temp = 104000,
.trip_type = THERMAL_TRIP_CRITICAL,
.upper = THERMAL_NO_LIMIT,
.lower = THERMAL_NO_LIMIT,
@@ -1225,5 +1226,10 @@ static struct soctherm_platform_data dalmore_soctherm_data = {
int __init dalmore_soctherm_init(void)
{
+ tegra_platform_edp_init(dalmore_soctherm_data.therm[THERM_CPU].trips,
+ &dalmore_soctherm_data.therm[THERM_CPU].num_trips);
+ tegra_add_tj_trips(dalmore_soctherm_data.therm[THERM_CPU].trips,
+ &dalmore_soctherm_data.therm[THERM_CPU].num_trips);
+
return tegra11_soctherm_init(&dalmore_soctherm_data);
}