Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 234a56c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-linus-v4.2' of... 

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

Pull hwmon updates from Guenter Roeck:

 - new driver for Microchip TC74

 - support for ncpXXwf104 added to ntc_thermistor driver

 - minor cleanup

* tag 'hwmon-for-linus-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: add driver for Microchip TC74
  hwmon: (ntc_thermistor) Improve precision of resistance calculation
  hwmon: (ntc_thermistor) fix iio raw to microvolts conversion
  hwmon: (atxp1) Drop auto-detection
  hwmon: (atxp1) Drop FSF mailing address
  hwmon: Allow compile test of GPIO consumers if !GPIOLIB
  hwmon: (sht15) Constify platform_device_id
  hwmon: (max197) Constify platform_device_id
  hwmon: (ntc_thermistor) Add support for ncpXXwf104
parents a57f14ba 761c1770

Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Requires node properties: 
	"murata,ncp21wb473"

	"murata,ncp03wb473"

	"murata,ncp15wl333"

	"murata,ncp03wf104"



/* Usage of vendor name "ntc" is deprecated */

<DEPRECATED>	"ntc,ncp15wb473"

Documentation/hwmon/ntc_thermistor

+4 −2
Original line number Diff line number Diff line
@@ -2,8 +2,10 @@ Kernel driver ntc_thermistor 
=================



Supported thermistors from Murata:

* Murata NTC Thermistors NCP15WB473, NCP18WB473, NCP21WB473, NCP03WB473, NCP15WL333

  Prefixes: 'ncp15wb473', 'ncp18wb473', 'ncp21wb473', 'ncp03wb473', 'ncp15wl333'

* Murata NTC Thermistors NCP15WB473, NCP18WB473, NCP21WB473, NCP03WB473,

  NCP15WL333, NCP03WF104

  Prefixes: 'ncp15wb473', 'ncp18wb473', 'ncp21wb473', 'ncp03wb473',

  'ncp15wl333', 'ncp03wf104'

  Datasheet: Publicly available at Murata



Supported thermistors from EPCOS:

Documentation/hwmon/tc74

0 → 100644
+20 −0
Original line number Diff line number Diff line 
Kernel driver tc74

====================



Supported chips:

   * Microchip TC74

     Prefix: 'tc74'

     Datasheet: Publicly available at Microchip website.



Description

-----------



Driver supports the above part.



The tc74 has an 8-bit sensor, with 1 degree centigrade resolution

and +- 2 degrees centigrade accuracy.



Notes

-----



Currently entering low power standby mode is not supported.

drivers/hwmon/Kconfig

+14 −4
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ config SENSORS_G762 


config SENSORS_GPIO_FAN

	tristate "GPIO fan"

	depends on GPIOLIB

	depends on GPIOLIB || COMPILE_TEST

	depends on THERMAL || THERMAL=n

	help

	  If you say yes here you get support for fans connected to GPIO lines.
@@ -1106,8 +1106,8 @@ config SENSORS_NTC_THERMISTOR 
	  send notifications about the temperature.



	  Currently, this driver supports

	  NCP15WB473, NCP18WB473, NCP21WB473, NCP03WB473, and NCP15WL333

	  from Murata and B57330V2103 from EPCOS.

	  NCP15WB473, NCP18WB473, NCP21WB473, NCP03WB473, NCP15WL333,

	  and NCP03WF104 from Murata and B57330V2103 from EPCOS.



	  This driver can also be built as a module.  If so, the module

	  will be called ntc-thermistor.
@@ -1186,7 +1186,7 @@ config SENSORS_PWM_FAN 


config SENSORS_SHT15

	tristate "Sensiron humidity and temperature sensors. SHT15 and compat."

	depends on GPIOLIB

	depends on GPIOLIB || COMPILE_TEST

	help

	  If you say yes here you get support for the Sensiron SHT10, SHT11,

	  SHT15, SHT71, SHT75 humidity and temperature sensors.
@@ -1452,6 +1452,16 @@ config SENSORS_INA2XX 
	  This driver can also be built as a module.  If so, the module

	  will be called ina2xx.



config SENSORS_TC74

	tristate "Microchip TC74"

	depends on I2C

	help

	  If you say yes here you get support for Microchip TC74 single

	  input temperature sensor chips.



	  This driver can also be built as a module.  If so, the module

	  will be called tc74.



config SENSORS_THMC50

	tristate "Texas Instruments THMC50 / Analog Devices ADM1022"

	depends on I2C

drivers/hwmon/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc47b397.o 
obj-$(CONFIG_SENSORS_SMSC47M1)	+= smsc47m1.o

obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o

obj-$(CONFIG_SENSORS_AMC6821)	+= amc6821.o

obj-$(CONFIG_SENSORS_TC74)	+= tc74.o

obj-$(CONFIG_SENSORS_THMC50)	+= thmc50.o

obj-$(CONFIG_SENSORS_TMP102)	+= tmp102.o

obj-$(CONFIG_SENSORS_TMP103)	+= tmp103.o