diff options
| author | Jean Delvare <khali@linux-fr.org> | 2011-11-04 12:00:47 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-11 09:37:00 -0800 |
| commit | e3c298129b14f1591e647320bba3f9bc21ea63f1 (patch) | |
| tree | 2a63fa619188176f40e741384d1be38f586f89f1 /drivers/hwmon | |
| parent | 0fb2a32e2c8f58b5d43846e4de46364998f9af5d (diff) | |
| download | kernel_samsung_smdk4412-e3c298129b14f1591e647320bba3f9bc21ea63f1.zip kernel_samsung_smdk4412-e3c298129b14f1591e647320bba3f9bc21ea63f1.tar.gz kernel_samsung_smdk4412-e3c298129b14f1591e647320bba3f9bc21ea63f1.tar.bz2 | |
hwmon: (w83627ehf) Properly report PECI and AMD-SI sensor types
commit 2265cef2751b3441df91f85e0107f9f549e5b711 upstream.
When temperature sources are PECI or AMD-SI agents, it makes no sense
to report their type as diode or thermistor. Instead we must report
their digital nature.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/w83627ehf.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c index 36d7f27..7be763d 100644 --- a/drivers/hwmon/w83627ehf.c +++ b/drivers/hwmon/w83627ehf.c @@ -1756,7 +1756,14 @@ static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data, diode = 0x70; } for (i = 0; i < 3; i++) { - if ((tmp & (0x02 << i))) + const char *label = data->temp_label[data->temp_src[i]]; + + /* Digital source overrides analog type */ + if (strncmp(label, "PECI", 4) == 0) + data->temp_type[i] = 6; + else if (strncmp(label, "AMD", 3) == 0) + data->temp_type[i] = 5; + else if ((tmp & (0x02 << i))) data->temp_type[i] = (diode & (0x10 << i)) ? 1 : 3; else data->temp_type[i] = 4; /* thermistor */ |