summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/tegra3_tsensor.c
diff options
context:
space:
mode:
authorJoshua Primero <jprimero@nvidia.com>2012-01-17 17:03:48 -0800
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-01-24 10:58:40 -0800
commit42e6bff9dc477683df5e235eaf04d3c628ba1442 (patch)
tree79725c5b39e6b3d7d8a0803f0cb0a5edc954adb1 /arch/arm/mach-tegra/tegra3_tsensor.c
parentef9b0e60d0afc5a3a6e5f2a560464cf92222b304 (diff)
arm: tegra: tsensor: Remove tsensor init
Removed tsensor initialization if external tdiode is being used for temperature measurements. bug 928188 Reviewed-on: http://git-master/r/75995 Change-Id: Ifcfd5b4c2b094dcd4fb5386708b332f2a76c272c Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com> Signed-off-by: Joshua Primero <jprimero@nvidia.com> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/76819 Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'arch/arm/mach-tegra/tegra3_tsensor.c')
-rw-r--r--arch/arm/mach-tegra/tegra3_tsensor.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/tegra3_tsensor.c b/arch/arm/mach-tegra/tegra3_tsensor.c
index 4bcd81d4bc29..32fe90be1bee 100644
--- a/arch/arm/mach-tegra/tegra3_tsensor.c
+++ b/arch/arm/mach-tegra/tegra3_tsensor.c
@@ -118,12 +118,9 @@ static void tegra3_tsensor_probe_callback(struct tegra_tsensor_data *data)
if (tegra_thermal_set_device(thermal_device)) /* This should not fail */
BUG();
}
-#endif
static struct tegra_tsensor_platform_data tsensor_data = {
-#ifdef CONFIG_TEGRA_INTERNAL_TSENSOR_EDP_SUPPORT
.probe_callback = tegra3_tsensor_probe_callback,
-#endif
};
void __init tegra3_tsensor_init(struct tegra_tsensor_pmu_data *data)
@@ -189,4 +186,8 @@ labelSkipPowerOff:
labelEnd:
return;
}
-
+#else
+void __init tegra3_tsensor_init(struct tegra_tsensor_pmu_data *data)
+{
+}
+#endif