aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorMika Westerberg <mika.westerberg@linux.intel.com>2011-12-15 17:28:24 -0500
committerMatthew Garrett <mjg@redhat.com>2012-03-20 12:02:20 -0400
commit0266e49b3fd37065f9f90856c75f442c020bd96e (patch)
treefb4c0e80038b533108ab8fbb72617d79484a7d65 /drivers/platform
parent420138a7477eaebafddaefb7412736d924ca7d73 (diff)
platform-x86: intel_mid_thermal: turn off thermistor voltage by default
Instead of complaining that the voltage is on, we can just ask the MSIC to turn the voltage off. This should save some power. Voltage for thermistors is turned on when ADC conversion is initiated. Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/intel_mid_thermal.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/platform/x86/intel_mid_thermal.c b/drivers/platform/x86/intel_mid_thermal.c
index b07f93d64a91..acd7d2d3d912 100644
--- a/drivers/platform/x86/intel_mid_thermal.c
+++ b/drivers/platform/x86/intel_mid_thermal.c
@@ -360,8 +360,10 @@ static int mid_initialize_adc(struct device *dev)
360 if (ret) 360 if (ret)
361 return ret; 361 return ret;
362 362
363 if (data & MSIC_ADCTHERM_MASK) 363 data &= ~MSIC_ADCTHERM_MASK;
364 dev_warn(dev, "ADCTHERM already set"); 364 ret = intel_msic_reg_write(INTEL_MSIC_ADC1CNTL3, data);
365 if (ret)
366 return ret;
365 367
366 /* Index of the first channel in which the stop bit is set */ 368 /* Index of the first channel in which the stop bit is set */
367 channel_index = find_free_channel(); 369 channel_index = find_free_channel();