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

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: (24 commits)
  hwmon: (lm90) Refactor reading of config2 register
  hwmon: (lm90) Make SA56004 detection more robust
  hwmon: (lm90) Simplify handling of extended local temp register
  hwmon: (pmbus) Add client driver for LM25066, LM5064, and LM5066
  hwmon: (max34440) Add support for peak attributes
  hwmon: (max8688) Add support for peak attributes
  hwmon: (max16064) Add support for peak attributes
  hwmon: (adm1275) Add support for peak attributes
  hwmon: (pmbus) Add support for peak attributes
  hwmon: Add new attributes to sysfs ABI
  hwmon: (pmbus) Strengthen check for status register existence
  hwmon: (pmbus) Add support for virtual pages
  hwmon: (pmbus) Support reading and writing of word registers in device specific code
  hwmon: (pmbus) Increase attribute name size
  hwmon: (pmbus) Add ADP4000, NCP4200 and NCP4208 to list of supported devices
  hwmon: (pmbus) Add support for VID output voltage mode
  hwmon: (pmbus) Move PMBus drivers to drivers/hwmon/pmbus
  hwmon: (coretemp) Add core/pkg threshold support to Coretemp
  hwmon: (lm95241) Add support for LM95231
  hwmon: LM95245 driver
  ...

1 files changed, 38 insertions, 89 deletions

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 0598cd22edf2..0b62c3c6b7ce 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -623,7 +623,7 @@ config SENSORS_LM90
           LM86, LM89 and LM99, Analog Devices ADM1032, ADT7461, and ADT7461A,
           Maxim MAX6646, MAX6647, MAX6648, MAX6649, MAX6657, MAX6658, MAX6659,
           MAX6680, MAX6681, MAX6692, MAX6695, MAX6696, ON Semiconductor NCT1008,
-          and Winbond/Nuvoton W83L771W/G/AWG/ASG sensor chips.
+          Winbond/Nuvoton W83L771W/G/AWG/ASG and Philips SA56004 sensor chips.
 
           This driver can also be built as a module.  If so, the module
           will be called lm90.
@@ -694,14 +694,24 @@ config SENSORS_LTC4261
           be called ltc4261.
 
 config SENSORS_LM95241
-        tristate "National Semiconductor LM95241 sensor chip"
+        tristate "National Semiconductor LM95241 and compatibles"
         depends on I2C
         help
-          If you say yes here you get support for LM95241 sensor chip.
+          If you say yes here you get support for LM95231 and LM95241 sensor
+          chips.
 
           This driver can also be built as a module.  If so, the module
           will be called lm95241.
 
+config SENSORS_LM95245
+        tristate "National Semiconductor LM95245 sensor chip"
+        depends on I2C && EXPERIMENTAL
+        help
+          If you say yes here you get support for LM95245 sensor chip.
+
+          This driver can also be built as a module.  If so, the module
+          will be called lm95245.
+
 config SENSORS_MAX1111
         tristate "Maxim MAX1111 Multichannel, Serial 8-bit ADC chip"
         depends on SPI_MASTER
@@ -736,6 +746,16 @@ config SENSORS_MAX1619
           This driver can also be built as a module.  If so, the module
           will be called max1619.
 
+config SENSORS_MAX1668
+        tristate "Maxim MAX1668 and compatibles"
+        depends on I2C && EXPERIMENTAL
+        help
+          If you say yes here you get support for MAX1668, MAX1989 and
+          MAX1805 chips.
+
+          This driver can also be built as a module.  If so, the module
+          will be called max1668.
+
 config SENSORS_MAX6639
         tristate "Maxim MAX6639 sensor chip"
         depends on I2C && EXPERIMENTAL
@@ -767,6 +787,20 @@ config SENSORS_MAX6650
           This driver can also be built as a module.  If so, the module
           will be called max6650.
 
+config SENSORS_NTC_THERMISTOR
+        tristate "NTC thermistor support"
+        depends on EXPERIMENTAL
+        help
+          This driver supports NTC thermistors sensor reading and its
+          interpretation. The driver can also monitor the temperature and
+          send notifications about the temperature.
+
+          Currently, this driver supports
+          NCP15WB473, NCP18WB473, NCP21WB473, NCP03WB473, and NCP15WL333.
+
+          This driver can also be built as a module.  If so, the module
+          will be called ntc-thermistor.
+
 config SENSORS_PC87360
         tristate "National Semiconductor PC87360 family"
         select HWMON_VID
@@ -807,92 +841,7 @@ config SENSORS_PCF8591
           These devices are hard to detect and rarely found on mainstream
           hardware.  If unsure, say N.
 
-config PMBUS
-        tristate "PMBus support"
-        depends on I2C && EXPERIMENTAL
-        default n
-        help
-          Say yes here if you want to enable PMBus support.
-
-          This driver can also be built as a module. If so, the module will
-          be called pmbus_core.
-
-if PMBUS
-
-config SENSORS_PMBUS
-        tristate "Generic PMBus devices"
-        default n
-        help
-          If you say yes here you get hardware monitoring support for generic
-          PMBus devices, including but not limited to BMR450, BMR451, BMR453,
-          BMR454, and LTC2978.
-
-          This driver can also be built as a module. If so, the module will
-          be called pmbus.
-
-config SENSORS_ADM1275
-        tristate "Analog Devices ADM1275"
-        default n
-        help
-          If you say yes here you get hardware monitoring support for Analog
-          Devices ADM1275 Hot-Swap Controller and Digital Power Monitor.
-
-          This driver can also be built as a module. If so, the module will
-          be called adm1275.
-
-config SENSORS_MAX16064
-        tristate "Maxim MAX16064"
-        default n
-        help
-          If you say yes here you get hardware monitoring support for Maxim
-          MAX16064.
-
-          This driver can also be built as a module. If so, the module will
-          be called max16064.
-
-config SENSORS_MAX34440
-        tristate "Maxim MAX34440/MAX34441"
-        default n
-        help
-          If you say yes here you get hardware monitoring support for Maxim
-          MAX34440 and MAX34441.
-
-          This driver can also be built as a module. If so, the module will
-          be called max34440.
-
-config SENSORS_MAX8688
-        tristate "Maxim MAX8688"
-        default n
-        help
-          If you say yes here you get hardware monitoring support for Maxim
-          MAX8688.
-
-          This driver can also be built as a module. If so, the module will
-          be called max8688.
-
-config SENSORS_UCD9000
-        tristate "TI UCD90120, UCD90124, UCD9090, UCD90910"
-        default n
-        help
-          If you say yes here you get hardware monitoring support for TI
-          UCD90120, UCD90124, UCD9090, UCD90910 Sequencer and System Health
-          Controllers.
-
-          This driver can also be built as a module. If so, the module will
-          be called ucd9000.
-
-config SENSORS_UCD9200
-        tristate "TI UCD9220, UCD9222, UCD9224, UCD9240, UCD9244, UCD9246, UCD9248"
-        default n
-        help
-          If you say yes here you get hardware monitoring support for TI
-          UCD9220, UCD9222, UCD9224, UCD9240, UCD9244, UCD9246, and UCD9248
-          Digital PWM System Controllers.
-
-          This driver can also be built as a module. If so, the module will
-          be called ucd9200.
-
-endif # PMBUS
+source drivers/hwmon/pmbus/Kconfig
 
 config SENSORS_SHT15
         tristate "Sensiron humidity and temperature sensors. SHT15 and compat."