Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon patches from Guenter Roeck:
"Bug fixes for sht15 and ltc2978 driver plus some documentation
updates"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (sht15) Check return value of regulator_enable()
hwmon: (adt7410) Document ADT7420 support
hwmon: (pmbus/ltc2978) Use detected chip ID to select supported functionality
hwmon: (pmbus/ltc2978) Fix peak attribute handling
hwmon: (pmbus/ltc2978) Update datasheet links
hwmon: Update my e-mail address in driver documentation

+50 -33
+1 -1
Documentation/hwmon/adm1275
··· 15 15 Addresses scanned: - 16 16 Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1276.pdf 17 17 18 - Author: Guenter Roeck <guenter.roeck@ericsson.com> 18 + Author: Guenter Roeck <linux@roeck-us.net> 19 19 20 20 21 21 Description
+10 -1
Documentation/hwmon/adt7410
··· 4 4 Supported chips: 5 5 * Analog Devices ADT7410 6 6 Prefix: 'adt7410' 7 - Addresses scanned: I2C 0x48 - 0x4B 7 + Addresses scanned: None 8 8 Datasheet: Publicly available at the Analog Devices website 9 9 http://www.analog.com/static/imported-files/data_sheets/ADT7410.pdf 10 + * Analog Devices ADT7420 11 + Prefix: 'adt7420' 12 + Addresses scanned: None 13 + Datasheet: Publicly available at the Analog Devices website 14 + http://www.analog.com/static/imported-files/data_sheets/ADT7420.pdf 10 15 11 16 Author: Hartmut Knaack <knaack.h@gmx.de> 12 17 ··· 31 26 value per second or even justget one sample on demand for power saving. 32 27 Besides, it can completely power down its ADC, if power management is 33 28 required. 29 + 30 + The ADT7420 is register compatible, the only differences being the package, 31 + a slightly narrower operating temperature range (-40°C to +150°C), and a 32 + better accuracy (0.25°C instead of 0.50°C.) 34 33 35 34 Configuration Notes 36 35 -------------------
+1 -1
Documentation/hwmon/jc42
··· 49 49 Addresses scanned: I2C 0x18 - 0x1f 50 50 51 51 Author: 52 - Guenter Roeck <guenter.roeck@ericsson.com> 52 + Guenter Roeck <linux@roeck-us.net> 53 53 54 54 55 55 Description
+1 -1
Documentation/hwmon/lineage-pem
··· 8 8 Documentation: 9 9 http://www.lineagepower.com/oem/pdf/CPLI2C.pdf 10 10 11 - Author: Guenter Roeck <guenter.roeck@ericsson.com> 11 + Author: Guenter Roeck <linux@roeck-us.net> 12 12 13 13 14 14 Description
+1 -1
Documentation/hwmon/lm25066
··· 19 19 Datasheet: 20 20 http://www.national.com/pf/LM/LM5066.html 21 21 22 - Author: Guenter Roeck <guenter.roeck@ericsson.com> 22 + Author: Guenter Roeck <linux@roeck-us.net> 23 23 24 24 25 25 Description
+3 -3
Documentation/hwmon/ltc2978
··· 5 5 * Linear Technology LTC2978 6 6 Prefix: 'ltc2978' 7 7 Addresses scanned: - 8 - Datasheet: http://cds.linear.com/docs/Datasheet/2978fa.pdf 8 + Datasheet: http://www.linear.com/product/ltc2978 9 9 * Linear Technology LTC3880 10 10 Prefix: 'ltc3880' 11 11 Addresses scanned: - 12 - Datasheet: http://cds.linear.com/docs/Datasheet/3880f.pdf 12 + Datasheet: http://www.linear.com/product/ltc3880 13 13 14 - Author: Guenter Roeck <guenter.roeck@ericsson.com> 14 + Author: Guenter Roeck <linux@roeck-us.net> 15 15 16 16 17 17 Description
+1 -1
Documentation/hwmon/ltc4261
··· 8 8 Datasheet: 9 9 http://cds.linear.com/docs/Datasheet/42612fb.pdf 10 10 11 - Author: Guenter Roeck <guenter.roeck@ericsson.com> 11 + Author: Guenter Roeck <linux@roeck-us.net> 12 12 13 13 14 14 Description
+1 -1
Documentation/hwmon/max16064
··· 7 7 Addresses scanned: - 8 8 Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX16064.pdf 9 9 10 - Author: Guenter Roeck <guenter.roeck@ericsson.com> 10 + Author: Guenter Roeck <linux@roeck-us.net> 11 11 12 12 13 13 Description
+1 -1
Documentation/hwmon/max16065
··· 24 24 http://datasheets.maxim-ic.com/en/ds/MAX16070-MAX16071.pdf 25 25 26 26 27 - Author: Guenter Roeck <guenter.roeck@ericsson.com> 27 + Author: Guenter Roeck <linux@roeck-us.net> 28 28 29 29 30 30 Description
+1 -1
Documentation/hwmon/max34440
··· 27 27 Addresses scanned: - 28 28 Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX34461.pdf 29 29 30 - Author: Guenter Roeck <guenter.roeck@ericsson.com> 30 + Author: Guenter Roeck <linux@roeck-us.net> 31 31 32 32 33 33 Description
+1 -1
Documentation/hwmon/max8688
··· 7 7 Addresses scanned: - 8 8 Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX8688.pdf 9 9 10 - Author: Guenter Roeck <guenter.roeck@ericsson.com> 10 + Author: Guenter Roeck <linux@roeck-us.net> 11 11 12 12 13 13 Description
+1 -1
Documentation/hwmon/pmbus
··· 34 34 Addresses scanned: - 35 35 Datasheet: n.a. 36 36 37 - Author: Guenter Roeck <guenter.roeck@ericsson.com> 37 + Author: Guenter Roeck <linux@roeck-us.net> 38 38 39 39 40 40 Description
+1 -1
Documentation/hwmon/smm665
··· 29 29 http://www.summitmicro.com/prod_select/summary/SMM766/SMM766_2086.pdf 30 30 http://www.summitmicro.com/prod_select/summary/SMM766B/SMM766B_2122.pdf 31 31 32 - Author: Guenter Roeck <guenter.roeck@ericsson.com> 32 + Author: Guenter Roeck <linux@roeck-us.net> 33 33 34 34 35 35 Module Parameters
+1 -1
Documentation/hwmon/ucd9000
··· 11 11 http://focus.ti.com/lit/ds/symlink/ucd9090.pdf 12 12 http://focus.ti.com/lit/ds/symlink/ucd90910.pdf 13 13 14 - Author: Guenter Roeck <guenter.roeck@ericsson.com> 14 + Author: Guenter Roeck <linux@roeck-us.net> 15 15 16 16 17 17 Description
+1 -1
Documentation/hwmon/ucd9200
··· 15 15 http://focus.ti.com/lit/ds/symlink/ucd9246.pdf 16 16 http://focus.ti.com/lit/ds/symlink/ucd9248.pdf 17 17 18 - Author: Guenter Roeck <guenter.roeck@ericsson.com> 18 + Author: Guenter Roeck <linux@roeck-us.net> 19 19 20 20 21 21 Description
+1 -1
Documentation/hwmon/zl6100
··· 54 54 http://archive.ericsson.net/service/internet/picov/get?DocNo=28701-EN/LZT146256 55 55 56 56 57 - Author: Guenter Roeck <guenter.roeck@ericsson.com> 57 + Author: Guenter Roeck <linux@roeck-us.net> 58 58 59 59 60 60 Description
+16 -14
drivers/hwmon/pmbus/ltc2978.c
··· 62 62 int temp_min, temp_max; 63 63 int vout_min[8], vout_max[8]; 64 64 int iout_max[2]; 65 - int temp2_max[2]; 65 + int temp2_max; 66 66 struct pmbus_driver_info info; 67 67 }; 68 68 ··· 204 204 ret = pmbus_read_word_data(client, page, 205 205 LTC3880_MFR_TEMPERATURE2_PEAK); 206 206 if (ret >= 0) { 207 - if (lin11_to_val(ret) 208 - > lin11_to_val(data->temp2_max[page])) 209 - data->temp2_max[page] = ret; 210 - ret = data->temp2_max[page]; 207 + if (lin11_to_val(ret) > lin11_to_val(data->temp2_max)) 208 + data->temp2_max = ret; 209 + ret = data->temp2_max; 211 210 } 212 211 break; 213 212 case PMBUS_VIRT_READ_VIN_MIN: ··· 247 248 248 249 switch (reg) { 249 250 case PMBUS_VIRT_RESET_IOUT_HISTORY: 250 - data->iout_max[page] = 0x7fff; 251 + data->iout_max[page] = 0x7c00; 251 252 ret = ltc2978_clear_peaks(client, page, data->id); 252 253 break; 253 254 case PMBUS_VIRT_RESET_TEMP2_HISTORY: 254 - data->temp2_max[page] = 0x7fff; 255 + data->temp2_max = 0x7c00; 255 256 ret = ltc2978_clear_peaks(client, page, data->id); 256 257 break; 257 258 case PMBUS_VIRT_RESET_VOUT_HISTORY: ··· 261 262 break; 262 263 case PMBUS_VIRT_RESET_VIN_HISTORY: 263 264 data->vin_min = 0x7bff; 264 - data->vin_max = 0; 265 + data->vin_max = 0x7c00; 265 266 ret = ltc2978_clear_peaks(client, page, data->id); 266 267 break; 267 268 case PMBUS_VIRT_RESET_TEMP_HISTORY: 268 269 data->temp_min = 0x7bff; 269 - data->temp_max = 0x7fff; 270 + data->temp_max = 0x7c00; 270 271 ret = ltc2978_clear_peaks(client, page, data->id); 271 272 break; 272 273 default: ··· 320 321 info = &data->info; 321 322 info->write_word_data = ltc2978_write_word_data; 322 323 323 - data->vout_min[0] = 0xffff; 324 324 data->vin_min = 0x7bff; 325 + data->vin_max = 0x7c00; 325 326 data->temp_min = 0x7bff; 326 - data->temp_max = 0x7fff; 327 + data->temp_max = 0x7c00; 328 + data->temp2_max = 0x7c00; 327 329 328 - switch (id->driver_data) { 330 + switch (data->id) { 329 331 case ltc2978: 330 332 info->read_word_data = ltc2978_read_word_data; 331 333 info->pages = 8; ··· 336 336 for (i = 1; i < 8; i++) { 337 337 info->func[i] = PMBUS_HAVE_VOUT 338 338 | PMBUS_HAVE_STATUS_VOUT; 339 - data->vout_min[i] = 0xffff; 340 339 } 341 340 break; 342 341 case ltc3880: ··· 351 352 | PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT 352 353 | PMBUS_HAVE_POUT 353 354 | PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP; 354 - data->vout_min[1] = 0xffff; 355 + data->iout_max[0] = 0x7c00; 356 + data->iout_max[1] = 0x7c00; 355 357 break; 356 358 default: 357 359 return -ENODEV; 358 360 } 361 + for (i = 0; i < info->pages; i++) 362 + data->vout_min[i] = 0xffff; 359 363 360 364 return pmbus_do_probe(client, id, info); 361 365 }
+7 -1
drivers/hwmon/sht15.c
··· 965 965 if (voltage) 966 966 data->supply_uv = voltage; 967 967 968 - regulator_enable(data->reg); 968 + ret = regulator_enable(data->reg); 969 + if (ret != 0) { 970 + dev_err(&pdev->dev, 971 + "failed to enable regulator: %d\n", ret); 972 + return ret; 973 + } 974 + 969 975 /* 970 976 * Setup a notifier block to update this if another device 971 977 * causes the voltage to change