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

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
...@@ -48,7 +48,7 @@ adc@12D10000 { ...@@ -48,7 +48,7 @@ adc@12D10000 {
/* NTC thermistor is a hwmon device */ /* NTC thermistor is a hwmon device */
ncp15wb473@0 { ncp15wb473@0 {
compatible = "ntc,ncp15wb473"; compatible = "murata,ncp15wb473";
pullup-uv = <1800000>; pullup-uv = <1800000>;
pullup-ohm = <47000>; pullup-ohm = <47000>;
pulldown-ohm = <0>; pulldown-ohm = <0>;
......
...@@ -3,11 +3,19 @@ NTC Thermistor hwmon sensors ...@@ -3,11 +3,19 @@ NTC Thermistor hwmon sensors
Requires node properties: Requires node properties:
- "compatible" value : one of - "compatible" value : one of
"ntc,ncp15wb473" "murata,ncp15wb473"
"ntc,ncp18wb473" "murata,ncp18wb473"
"ntc,ncp21wb473" "murata,ncp21wb473"
"ntc,ncp03wb473" "murata,ncp03wb473"
"ntc,ncp15wl333" "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-uv" Pull up voltage in micro volts
- "pullup-ohm" Pull up resistor value in ohms - "pullup-ohm" Pull up resistor value in ohms
- "pulldown-ohm" Pull down resistor value in ohms - "pulldown-ohm" Pull down resistor value in ohms
...@@ -21,7 +29,7 @@ Read more about iio bindings at ...@@ -21,7 +29,7 @@ Read more about iio bindings at
Example: Example:
ncp15wb473@0 { ncp15wb473@0 {
compatible = "ntc,ncp15wb473"; compatible = "murata,ncp15wb473";
pullup-uv = <1800000>; pullup-uv = <1800000>;
pullup-ohm = <47000>; pullup-ohm = <47000>;
pulldown-ohm = <0>; pulldown-ohm = <0>;
......
...@@ -83,6 +83,7 @@ mosaixtech Mosaix Technologies, Inc. ...@@ -83,6 +83,7 @@ mosaixtech Mosaix Technologies, Inc.
moxa Moxa moxa Moxa
mpl MPL AG mpl MPL AG
mundoreader Mundo Reader S.L. mundoreader Mundo Reader S.L.
murata Murata Manufacturing Co., Ltd.
mxicy Macronix International Co., Ltd. mxicy Macronix International Co., Ltd.
national National Semiconductor national National Semiconductor
neonode Neonode Inc. neonode Neonode Inc.
......
Kernel driver ntc_thermistor Kernel driver ntc_thermistor
================= =================
Supported thermistors: Supported thermistors from Murata:
* Murata NTC Thermistors NCP15WB473, NCP18WB473, NCP21WB473, NCP03WB473, NCP15WL333 * Murata NTC Thermistors NCP15WB473, NCP18WB473, NCP21WB473, NCP03WB473, NCP15WL333
Prefixes: 'ncp15wb473', 'ncp18wb473', 'ncp21wb473', 'ncp03wb473', 'ncp15wl333' Prefixes: 'ncp15wb473', 'ncp18wb473', 'ncp21wb473', 'ncp03wb473', 'ncp15wl333'
Datasheet: Publicly available at Murata Datasheet: Publicly available at Murata
...@@ -15,9 +15,9 @@ Authors: ...@@ -15,9 +15,9 @@ Authors:
Description Description
----------- -----------
The NTC thermistor is a simple thermistor that requires users to provide the The NTC (Negative Temperature Coefficient) thermistor is a simple thermistor
resistance and lookup the corresponding compensation table to get the that requires users to provide the resistance and lookup the corresponding
temperature input. compensation table to get the temperature input.
The NTC driver provides lookup tables with a linear approximation function 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. and four circuit models with an option not to use any of the four models.
......
...@@ -1052,7 +1052,7 @@ config SENSORS_PC87427 ...@@ -1052,7 +1052,7 @@ config SENSORS_PC87427
will be called pc87427. will be called pc87427.
config SENSORS_NTC_THERMISTOR config SENSORS_NTC_THERMISTOR
tristate "NTC thermistor support" tristate "NTC thermistor support from Murata"
depends on !OF || IIO=n || IIO depends on !OF || IIO=n || IIO
help help
This driver supports NTC thermistors sensor reading and its This driver supports NTC thermistors sensor reading and its
...@@ -1060,7 +1060,8 @@ config SENSORS_NTC_THERMISTOR ...@@ -1060,7 +1060,8 @@ config SENSORS_NTC_THERMISTOR
send notifications about the temperature. send notifications about the temperature.
Currently, this driver supports 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 This driver can also be built as a module. If so, the module
will be called ntc-thermistor. will be called ntc-thermistor.
...@@ -1176,6 +1177,7 @@ config SENSORS_DME1737 ...@@ -1176,6 +1177,7 @@ config SENSORS_DME1737
config SENSORS_EMC1403 config SENSORS_EMC1403
tristate "SMSC EMC1403/23 thermal sensor" tristate "SMSC EMC1403/23 thermal sensor"
depends on I2C depends on I2C
select REGMAP_I2C
help help
If you say yes here you get support for the SMSC EMC1403/23 If you say yes here you get support for the SMSC EMC1403/23
temperature monitoring chip. temperature monitoring chip.
......
...@@ -538,7 +538,7 @@ static int gpio_fan_probe(struct platform_device *pdev) ...@@ -538,7 +538,7 @@ static int gpio_fan_probe(struct platform_device *pdev)
/* Make this driver part of hwmon class. */ /* Make this driver part of hwmon class. */
fan_data->hwmon_dev = hwmon_device_register_with_groups(&pdev->dev, fan_data->hwmon_dev = hwmon_device_register_with_groups(&pdev->dev,
"gpio-fan", fan_data, "gpio_fan", fan_data,
gpio_fan_groups); gpio_fan_groups);
if (IS_ERR(fan_data->hwmon_dev)) if (IS_ERR(fan_data->hwmon_dev))
return PTR_ERR(fan_data->hwmon_dev); return PTR_ERR(fan_data->hwmon_dev);
......
...@@ -163,6 +163,18 @@ static int ntc_adc_iio_read(struct ntc_thermistor_platform_data *pdata) ...@@ -163,6 +163,18 @@ static int ntc_adc_iio_read(struct ntc_thermistor_platform_data *pdata)
} }
static const struct of_device_id ntc_match[] = { static const struct of_device_id ntc_match[] = {
{ .compatible = "murata,ncp15wb473",
.data = &ntc_thermistor_id[0] },
{ .compatible = "murata,ncp18wb473",
.data = &ntc_thermistor_id[1] },
{ .compatible = "murata,ncp21wb473",
.data = &ntc_thermistor_id[2] },
{ .compatible = "murata,ncp03wb473",
.data = &ntc_thermistor_id[3] },
{ .compatible = "murata,ncp15wl333",
.data = &ntc_thermistor_id[4] },
/* Usage of vendor name "ntc" is deprecated */
{ .compatible = "ntc,ncp15wb473", { .compatible = "ntc,ncp15wb473",
.data = &ntc_thermistor_id[0] }, .data = &ntc_thermistor_id[0] },
{ .compatible = "ntc,ncp18wb473", { .compatible = "ntc,ncp18wb473",
...@@ -534,7 +546,7 @@ static struct platform_driver ntc_thermistor_driver = { ...@@ -534,7 +546,7 @@ static struct platform_driver ntc_thermistor_driver = {
module_platform_driver(ntc_thermistor_driver); module_platform_driver(ntc_thermistor_driver);
MODULE_DESCRIPTION("NTC Thermistor Driver"); MODULE_DESCRIPTION("NTC Thermistor Driver from Murata");
MODULE_AUTHOR("MyungJoo Ham <myungjoo.ham@samsung.com>"); MODULE_AUTHOR("MyungJoo Ham <myungjoo.ham@samsung.com>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:ntc-thermistor"); MODULE_ALIAS("platform:ntc-thermistor");
...@@ -249,7 +249,7 @@ static ssize_t show_##reg(struct device *dev, struct device_attribute *attr, \ ...@@ -249,7 +249,7 @@ static ssize_t show_##reg(struct device *dev, struct device_attribute *attr, \
int nr = to_sensor_dev_attr(attr)->index; \ int nr = to_sensor_dev_attr(attr)->index; \
struct w83l786ng_data *data = w83l786ng_update_device(dev); \ struct w83l786ng_data *data = w83l786ng_update_device(dev); \
return sprintf(buf, "%d\n", \ return sprintf(buf, "%d\n", \
FAN_FROM_REG(data->fan[nr], DIV_FROM_REG(data->fan_div[nr]))); \ FAN_FROM_REG(data->reg[nr], DIV_FROM_REG(data->fan_div[nr]))); \
} }
show_fan_reg(fan); show_fan_reg(fan);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment