diff options
| author | Mika Westerberg <mika.westerberg@linux.intel.com> | 2011-12-15 22:28:24 +0000 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2012-03-20 12:02:20 -0400 |
| commit | 0266e49b3fd37065f9f90856c75f442c020bd96e (patch) | |
| tree | fb4c0e80038b533108ab8fbb72617d79484a7d65 /drivers/platform | |
| parent | 420138a7477eaebafddaefb7412736d924ca7d73 (diff) | |
| download | blackbird-op-linux-0266e49b3fd37065f9f90856c75f442c020bd96e.tar.gz blackbird-op-linux-0266e49b3fd37065f9f90856c75f442c020bd96e.zip | |
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.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 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) 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(); |
