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

Commit 2a80ff86 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull hwmon fixes from Guenter Roeck:
 "Various minor fixes"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (gpio-fan) Change name used in hwmon_device_register_with_groups
  hwmon: (emc1403) Fix missing 'select REGMAP_I2C' in Kconfig
  hwmon: (ntc_thermistor) Use the manufacturer name properly
  devicetree: bindings: Document murata vendor prefix
  hwmon: (w83l786ng) Report correct minimum fan speed
parents f40ede39 d26e0da7

Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ adc@12D10000 { 


	/* NTC thermistor is a hwmon device */

	ncp15wb473@0 {

		compatible = "ntc,ncp15wb473";

		compatible = "murata,ncp15wb473";

		pullup-uv = <1800000>;

		pullup-ohm = <47000>;

		pulldown-ohm = <0>;

Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt

+14 −6
Original line number Diff line number Diff line
@@ -3,11 +3,19 @@ NTC Thermistor hwmon sensors 


Requires node properties:

- "compatible" value : one of

	"ntc,ncp15wb473"

	"ntc,ncp18wb473"

	"ntc,ncp21wb473"

	"ntc,ncp03wb473"

	"ntc,ncp15wl333"

	"murata,ncp15wb473"

	"murata,ncp18wb473"

	"murata,ncp21wb473"

	"murata,ncp03wb473"

	"murata,ncp15wl333"



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

<DEPRECATED>	"ntc,ncp15wb473"

<DEPRECATED>	"ntc,ncp18wb473"

<DEPRECATED>	"ntc,ncp21wb473"

<DEPRECATED>	"ntc,ncp03wb473"

<DEPRECATED>	"ntc,ncp15wl333"



- "pullup-uv"	Pull up voltage in micro volts

- "pullup-ohm"	Pull up resistor value in ohms

- "pulldown-ohm" Pull down resistor value in ohms
@@ -21,7 +29,7 @@ Read more about iio bindings at 


Example:

	ncp15wb473@0 {

		compatible = "ntc,ncp15wb473";

		compatible = "murata,ncp15wb473";

		pullup-uv = <1800000>;

		pullup-ohm = <47000>;

		pulldown-ohm = <0>;

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ mosaixtech Mosaix Technologies, Inc. 
moxa	Moxa

mpl	MPL AG

mundoreader	Mundo Reader S.L.

murata	Murata Manufacturing Co., Ltd.

mxicy	Macronix International Co., Ltd.

national	National Semiconductor

neonode		Neonode Inc.

Documentation/hwmon/ntc_thermistor

+4 −4
Original line number Diff line number Diff line 
Kernel driver ntc_thermistor

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



Supported thermistors:

Supported thermistors from Murata:

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

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

  Datasheet: Publicly available at Murata
@@ -15,9 +15,9 @@ Authors: 
Description

-----------



The NTC thermistor is a simple thermistor that requires users to provide the

resistance and lookup the corresponding compensation table to get the

temperature input.

The NTC (Negative Temperature Coefficient) thermistor is a simple thermistor

that requires users to provide the resistance and lookup the corresponding

compensation table to get the temperature input.



The NTC driver provides lookup tables with a linear approximation function

and four circuit models with an option not to use any of the four models.

drivers/hwmon/Kconfig

+4 −2
Original line number Diff line number Diff line
@@ -1052,7 +1052,7 @@ config SENSORS_PC87427 
	  will be called pc87427.



config SENSORS_NTC_THERMISTOR

	tristate "NTC thermistor support"

	tristate "NTC thermistor support from Murata"

	depends on !OF || IIO=n || IIO

	help

	  This driver supports NTC thermistors sensor reading and its
@@ -1060,7 +1060,8 @@ config SENSORS_NTC_THERMISTOR 
	  send notifications about the temperature.



	  Currently, this driver supports

	  NCP15WB473, NCP18WB473, NCP21WB473, NCP03WB473, and NCP15WL333.

	  NCP15WB473, NCP18WB473, NCP21WB473, NCP03WB473, and NCP15WL333

	  from Murata.



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

	  will be called ntc-thermistor.
@@ -1176,6 +1177,7 @@ config SENSORS_DME1737 
config SENSORS_EMC1403

	tristate "SMSC EMC1403/23 thermal sensor"

	depends on I2C

	select REGMAP_I2C

	help

	  If you say yes here you get support for the SMSC EMC1403/23

	  temperature monitoring chip.