Commit-ID: 1b7ccabcc372152d1492241610e52b8ea14b0968 Gitweb: http://git.kernel.org/tip/1b7ccabcc372152d1492241610e52b8ea14b0968 Author: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx> AuthorDate: Mon, 5 Mar 2012 15:01:04 -0800 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Tue, 6 Mar 2012 09:01:26 +0100 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 <mika.westerberg@xxxxxxxxxxxxxxx> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx> Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx> Acked-by: Durgadoss R <durgadoss.r@xxxxxxxxx> Acked-by: H. Peter Anvin <hpa@xxxxxxxxx> Cc: Matthew Garrett <mjg@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Link: http://lkml.kernel.org/n/tip-85zdo06yve1o27jpwc74gzng@xxxxxxxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- drivers/platform/x86/intel_mid_thermal.c | 6 ++++-- 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 5917b3c..2ee9766 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(); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html