summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-cardhu.c
diff options
context:
space:
mode:
authorJoshua Primero <jprimero@nvidia.com>2012-05-17 12:17:15 -0700
committerSimone Willett <swillett@nvidia.com>2012-05-21 11:56:25 -0700
commite13ee8192e43a3f1ee6b7ae8842adbdb33eddae8 (patch)
tree050fe07a4258c82690533bca191a96a33bc1346e /arch/arm/mach-tegra/board-cardhu.c
parent4041e0c70be64c27d665ab4d1e47547e4d4014ec (diff)
arm: thermal: Removed nonTEGRA_THERMAL_SYSFS logic
All throttling must go through the Linux thermal sysfs framework now. Change-Id: Ia871e0b06e548d5d82211a65979bea52a6c28fb0 Signed-off-by: Joshua Primero <jprimero@nvidia.com> Reviewed-on: http://git-master/r/103183 Reviewed-by: Simone Willett <swillett@nvidia.com> Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-cardhu.c')
-rw-r--r--arch/arm/mach-tegra/board-cardhu.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c
index 0163587b82f5..9083828b8352 100644
--- a/arch/arm/mach-tegra/board-cardhu.c
+++ b/arch/arm/mach-tegra/board-cardhu.c
@@ -72,19 +72,17 @@
/* All units are in millicelsius */
static struct tegra_thermal_data thermal_data = {
- .temp_throttle = 85000,
.temp_shutdown = 90000,
.temp_offset = TDIODE_OFFSET, /* temps based on tdiode */
#ifdef CONFIG_TEGRA_EDP_LIMITS
.edp_offset = TDIODE_OFFSET, /* edp based on tdiode */
.hysteresis_edp = 3000,
#endif
-#ifdef CONFIG_TEGRA_THERMAL_SYSFS
+#ifdef CONFIG_TEGRA_THERMAL_THROTTLE
+ .temp_throttle = 85000,
.tc1 = 0,
.tc2 = 1,
.passive_delay = 2000,
-#else
- .hysteresis_throttle = 1000,
#endif
};