summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJean Huang <jeanh@nvidia.com>2013-04-08 16:36:57 -0700
committerSimone Willett <swillett@nvidia.com>2013-04-11 20:10:00 -0700
commit918f90fe97816f8974a9541dd6897c610cde3734 (patch)
treef2383587f8461d0c6c5822d1ebc9b16031a76d53 /arch
parent212424e7f4bead81c1b659cbb185eca6a2bd4802 (diff)
arm: tegra: roth: update fan/thermal trip points
Change-Id: I96302b8ce8ba29fe78dfd4c95ed8a2d1a8d7f8a2 Signed-off-by: Jean Huang <jeanh@nvidia.com> Reviewed-on: http://git-master/r/217550 Reviewed-by: Matt Wagner <mwagner@nvidia.com> Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/board-roth-fan.c2
-rw-r--r--arch/arm/mach-tegra/board-roth-sensors.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/board-roth-fan.c b/arch/arm/mach-tegra/board-roth-fan.c
index 62449dd46bf6..585190516856 100644
--- a/arch/arm/mach-tegra/board-roth-fan.c
+++ b/arch/arm/mach-tegra/board-roth-fan.c
@@ -52,7 +52,7 @@ static struct pwm_fan_platform_data fan_data_delta_6k = {
.active_steps = MAX_ACTIVE_STATES,
.active_rpm = {
0, 1000, 2000, 3000, 4000, 5000, 6000, 7000, 10000, 11000},
- .active_pwm = {0, 89*1024, 107*1024 , 150*1024, 235*1024, 240*1024,
+ .active_pwm = {0, 80*1024, 110*1024 , 150*1024, 235*1024, 240*1024,
245*1024, 250*1024, 252*1024, 255*1024},
.active_rru = {1024*40, 1024*2, 1024, 256,
256, 256, 256, 256, 256, 256},
diff --git a/arch/arm/mach-tegra/board-roth-sensors.c b/arch/arm/mach-tegra/board-roth-sensors.c
index 41ef1eac792d..81eab662aa76 100644
--- a/arch/arm/mach-tegra/board-roth-sensors.c
+++ b/arch/arm/mach-tegra/board-roth-sensors.c
@@ -128,7 +128,7 @@ static struct nct1008_platform_data roth_nct1008_pdata = {
/* Thermal Throttling */
[0] = {
.cdev_type = "tegra-balanced",
- .trip_temp = 86000,
+ .trip_temp = 80000,
.trip_type = THERMAL_TRIP_PASSIVE,
.upper = THERMAL_NO_LIMIT,
.lower = THERMAL_NO_LIMIT,
@@ -136,7 +136,7 @@ static struct nct1008_platform_data roth_nct1008_pdata = {
},
[1] = {
.cdev_type = "tegra-heavy",
- .trip_temp = 89000, /* shutdown_ext_limit - 2C */
+ .trip_temp = 86000, /* shutdown_ext_limit - 2C */
.trip_type = THERMAL_TRIP_PASSIVE,
.upper = 1,
.lower = 1,
@@ -498,9 +498,9 @@ static struct therm_fan_est_data fan_est_data_p2560 = {
},
},
.cdev_type = "pwm-fan",
- .active_trip_temps = {0, 60000, 73000, 83000, 130000,
+ .active_trip_temps = {0, 47000, 55000, 67000, 103000,
140000, 150000, 160000, 170000, 180000},
- .active_hysteresis = {0, 10000, 7000, 7000, 0, 0, 0, 0, 0, 0},
+ .active_hysteresis = {0, 12000, 7000, 10000, 0, 0, 0, 0, 0, 0},
};
static struct platform_device roth_fan_therm_est_device_p2560 = {