aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMika Westerberg <[email protected]>2012-03-05 15:01:04 -0800
committerIngo Molnar <[email protected]>2012-03-06 09:01:26 +0100
commit1b7ccabcc372152d1492241610e52b8ea14b0968 (patch)
tree18c411ad8c9e23cbd212ac2ba728cfd3561b6f23
parent634830704d80ee0f544c16ea3c19dd2e819d2256 (diff)
x86/mid/thermal: Turn off thermistor
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 <[email protected]> Signed-off-by: Kirill A. Shutemov <[email protected]> Signed-off-by: Alan Cox <[email protected]> Acked-by: Durgadoss R <[email protected]> Acked-by: H. Peter Anvin <[email protected]> Cc: Matthew Garrett <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Link: http://lkml.kernel.org/n/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
-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 5917b3c83728..2ee9766737ea 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)
if (ret)
return ret;
- if (data & MSIC_ADCTHERM_MASK)
- dev_warn(dev, "ADCTHERM already set");
+ data &= ~MSIC_ADCTHERM_MASK;
+ ret = intel_msic_reg_write(INTEL_MSIC_ADC1CNTL3, data);
+ if (ret)
+ return ret;
/* Index of the first channel in which the stop bit is set */
channel_index = find_free_channel();