summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/tegra3_tsensor.c
diff options
context:
space:
mode:
authorJoshua Primero <jprimero@nvidia.com>2012-05-25 15:54:13 -0700
committerSimone Willett <swillett@nvidia.com>2012-07-03 14:55:32 -0700
commit5b1fcd1355485d347b3f15807561500ec06224ca (patch)
tree3d1ee6898d3c1b2b177c52d2e268d76eeac5c81f /arch/arm/mach-tegra/tegra3_tsensor.c
parentad8fabee431584601e7184da76604ad3dfdd1109 (diff)
drivers: skin: Skin prediction algorithm
Added skin prediction algorithm. bug 1007726 Change-Id: Ia76f73cb818aa02e608e1fc69ab4d8277a5825eb Signed-off-by: Joshua Primero <jprimero@nvidia.com> Reviewed-on: http://git-master/r/104814 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/tegra3_tsensor.c')
-rw-r--r--arch/arm/mach-tegra/tegra3_tsensor.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/tegra3_tsensor.c b/arch/arm/mach-tegra/tegra3_tsensor.c
index 01d3cd7ec627..7a1c122099bc 100644
--- a/arch/arm/mach-tegra/tegra3_tsensor.c
+++ b/arch/arm/mach-tegra/tegra3_tsensor.c
@@ -1,7 +1,7 @@
/*
* arch/arm/mach-tegra/tegra3_tsensor.c
*
- * Copyright (C) 2011 NVIDIA Corporation.
+ * Copyright (C) 2011-2012 NVIDIA Corporation.
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
@@ -107,6 +107,7 @@ static void tegra3_tsensor_probe_callback(struct tegra_tsensor_data *data)
thermal_device->name = "tsensor";
thermal_device->data = data;
+ thermal_device->id = THERMAL_DEVICE_ID_TSENSOR;
thermal_device->offset = TSENSOR_OFFSET;
thermal_device->get_temp = tsensor_get_temp;
thermal_device->get_temp_low = tsensor_get_temp_low;
@@ -114,7 +115,8 @@ static void tegra3_tsensor_probe_callback(struct tegra_tsensor_data *data)
thermal_device->set_alert = tsensor_set_alert;
thermal_device->set_shutdown_temp = tsensor_set_shutdown_temp;
- if (tegra_thermal_set_device(thermal_device)) /* This should not fail */
+ /* This should not fail */
+ if (tegra_thermal_device_register(thermal_device))
BUG();
}