summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/include/mach
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/include/mach
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/include/mach')
-rw-r--r--arch/arm/mach-tegra/include/mach/thermal.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/include/mach/thermal.h b/arch/arm/mach-tegra/include/mach/thermal.h
index ab7b34492d9e..67586224cead 100644
--- a/arch/arm/mach-tegra/include/mach/thermal.h
+++ b/arch/arm/mach-tegra/include/mach/thermal.h
@@ -19,19 +19,17 @@
/* All units in millicelsius */
struct tegra_thermal_data {
- long temp_throttle;
long temp_shutdown;
long temp_offset;
#ifdef CONFIG_TEGRA_EDP_LIMITS
long edp_offset;
long hysteresis_edp;
#endif
-#ifdef CONFIG_TEGRA_THERMAL_SYSFS
+#ifdef CONFIG_TEGRA_THERMAL_THROTTLE
+ long temp_throttle;
int tc1;
int tc2;
long passive_delay;
-#else
- long hysteresis_throttle;
#endif
};