releases/3.8.4/hwmon-pmbus-ltc2978-fix-temperature-reporting.patch

   1 From 8c958c703ef8804093437959221951eaf0e1e664 Mon Sep 17 00:00:00 2001
   2 From: Guenter Roeck <linux@roeck-us.net>
   3 Date: Thu, 21 Feb 2013 10:27:54 -0800
   4 Subject: hwmon: (pmbus/ltc2978) Fix temperature reporting
   5
   6 From: Guenter Roeck <linux@roeck-us.net>
   7
   8 commit 8c958c703ef8804093437959221951eaf0e1e664 upstream.
   9
  10 On LTC2978, only READ_TEMPERATURE is supported. It reports
  11 the internal junction temperature. This register is unpaged.
  12
  13 On LTC3880, READ_TEMPERATURE and READ_TEMPERATURE2 are supported.
  14 READ_TEMPERATURE is paged and reports external temperatures.
  15 READ_TEMPERATURE2 is unpaged and reports the internal junction
  16 temperature.
  17
  18 Signed-off-by: Guenter Roeck <linux@roeck-us.net>
  19 Acked-by: Jean Delvare <khali@linux-fr.org>
  20 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  21
  22 ---
  23  drivers/hwmon/pmbus/ltc2978.c |   14 ++++++++------
  24  1 file changed, 8 insertions(+), 6 deletions(-)
  25
  26 --- a/drivers/hwmon/pmbus/ltc2978.c
  27 +++ b/drivers/hwmon/pmbus/ltc2978.c
  28 @@ -59,7 +59,7 @@ enum chips { ltc2978, ltc3880 };
  29  struct ltc2978_data {
  30         enum chips id;
  31         int vin_min, vin_max;
  32 -       int temp_min, temp_max;
  33 +       int temp_min, temp_max[2];
  34         int vout_min[8], vout_max[8];
  35         int iout_max[2];
  36         int temp2_max;
  37 @@ -113,9 +113,10 @@ static int ltc2978_read_word_data_common
  38                 ret = pmbus_read_word_data(client, page,
  39                                            LTC2978_MFR_TEMPERATURE_PEAK);
  40                 if (ret >= 0) {
  41 -                       if (lin11_to_val(ret) > lin11_to_val(data->temp_max))
  42 -                               data->temp_max = ret;
  43 -                       ret = data->temp_max;
  44 +                       if (lin11_to_val(ret)
  45 +                           > lin11_to_val(data->temp_max[page]))
  46 +                               data->temp_max[page] = ret;
  47 +                       ret = data->temp_max[page];
  48                 }
  49                 break;
  50         case PMBUS_VIRT_RESET_VOUT_HISTORY:
  51 @@ -266,7 +267,7 @@ static int ltc2978_write_word_data(struc
  52                 break;
  53         case PMBUS_VIRT_RESET_TEMP_HISTORY:
  54                 data->temp_min = 0x7bff;
  55 -               data->temp_max = 0x7c00;
  56 +               data->temp_max[page] = 0x7c00;
  57                 ret = ltc2978_clear_peaks(client, page, data->id);
  58                 break;
  59         default:
  60 @@ -323,7 +324,8 @@ static int ltc2978_probe(struct i2c_clie
  61         data->vin_min = 0x7bff;
  62         data->vin_max = 0x7c00;
  63         data->temp_min = 0x7bff;
  64 -       data->temp_max = 0x7c00;
  65 +       for (i = 0; i < ARRAY_SIZE(data->temp_max); i++)
  66 +               data->temp_max[i] = 0x7c00;
  67         data->temp2_max = 0x7c00;
  68
  69         switch (data->id) {