Skip to content

Commit 8b6f5e0

Browse files
Naveen Krishna Chatradhigroeck
authored andcommitted
hwmon: (ntc_thermistor) Use the manufacturer name properly
Murata Manufacturing Co., Ltd is the vendor for NTC (Negative Temperature coefficient) based Thermistors. But, the driver extensively uses "NTC" as the vendor name. This patch corrects the vendor name also updates the compatibility strings according to the vendor-prefix.txt Note: Drivers continue to support the previous compatible strings but further addition of these compatible strings in device tree is deprecated. Signed-off-by: Naveen Krishna Chatradhi <[email protected]> Reviewed-by: Javier Martinez Canillas <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
1 parent eab2014 commit 8b6f5e0

File tree

5 files changed

+35
-14
lines changed

5 files changed

+35
-14
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ adc@12D10000 {
4848

4949
/* NTC thermistor is a hwmon device */
5050
ncp15wb473@0 {
51-
compatible = "ntc,ncp15wb473";
51+
compatible = "murata,ncp15wb473";
5252
pullup-uv = <1800000>;
5353
pullup-ohm = <47000>;
5454
pulldown-ohm = <0>;

Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,19 @@ NTC Thermistor hwmon sensors
33

44
Requires node properties:
55
- "compatible" value : one of
6-
"ntc,ncp15wb473"
7-
"ntc,ncp18wb473"
8-
"ntc,ncp21wb473"
9-
"ntc,ncp03wb473"
10-
"ntc,ncp15wl333"
6+
"murata,ncp15wb473"
7+
"murata,ncp18wb473"
8+
"murata,ncp21wb473"
9+
"murata,ncp03wb473"
10+
"murata,ncp15wl333"
11+
12+
/* Usage of vendor name "ntc" is deprecated */
13+
<DEPRECATED> "ntc,ncp15wb473"
14+
<DEPRECATED> "ntc,ncp18wb473"
15+
<DEPRECATED> "ntc,ncp21wb473"
16+
<DEPRECATED> "ntc,ncp03wb473"
17+
<DEPRECATED> "ntc,ncp15wl333"
18+
1119
- "pullup-uv" Pull up voltage in micro volts
1220
- "pullup-ohm" Pull up resistor value in ohms
1321
- "pulldown-ohm" Pull down resistor value in ohms
@@ -21,7 +29,7 @@ Read more about iio bindings at
2129

2230
Example:
2331
ncp15wb473@0 {
24-
compatible = "ntc,ncp15wb473";
32+
compatible = "murata,ncp15wb473";
2533
pullup-uv = <1800000>;
2634
pullup-ohm = <47000>;
2735
pulldown-ohm = <0>;

Documentation/hwmon/ntc_thermistor

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Kernel driver ntc_thermistor
22
=================
33

4-
Supported thermistors:
4+
Supported thermistors from Murata:
55
* Murata NTC Thermistors NCP15WB473, NCP18WB473, NCP21WB473, NCP03WB473, NCP15WL333
66
Prefixes: 'ncp15wb473', 'ncp18wb473', 'ncp21wb473', 'ncp03wb473', 'ncp15wl333'
77
Datasheet: Publicly available at Murata
@@ -15,9 +15,9 @@ Authors:
1515
Description
1616
-----------
1717

18-
The NTC thermistor is a simple thermistor that requires users to provide the
19-
resistance and lookup the corresponding compensation table to get the
20-
temperature input.
18+
The NTC (Negative Temperature Coefficient) thermistor is a simple thermistor
19+
that requires users to provide the resistance and lookup the corresponding
20+
compensation table to get the temperature input.
2121

2222
The NTC driver provides lookup tables with a linear approximation function
2323
and four circuit models with an option not to use any of the four models.

drivers/hwmon/Kconfig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,15 +1052,16 @@ config SENSORS_PC87427
10521052
will be called pc87427.
10531053

10541054
config SENSORS_NTC_THERMISTOR
1055-
tristate "NTC thermistor support"
1055+
tristate "NTC thermistor support from Murata"
10561056
depends on !OF || IIO=n || IIO
10571057
help
10581058
This driver supports NTC thermistors sensor reading and its
10591059
interpretation. The driver can also monitor the temperature and
10601060
send notifications about the temperature.
10611061

10621062
Currently, this driver supports
1063-
NCP15WB473, NCP18WB473, NCP21WB473, NCP03WB473, and NCP15WL333.
1063+
NCP15WB473, NCP18WB473, NCP21WB473, NCP03WB473, and NCP15WL333
1064+
from Murata.
10641065

10651066
This driver can also be built as a module. If so, the module
10661067
will be called ntc-thermistor.

drivers/hwmon/ntc_thermistor.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,18 @@ static int ntc_adc_iio_read(struct ntc_thermistor_platform_data *pdata)
163163
}
164164

165165
static const struct of_device_id ntc_match[] = {
166+
{ .compatible = "murata,ncp15wb473",
167+
.data = &ntc_thermistor_id[0] },
168+
{ .compatible = "murata,ncp18wb473",
169+
.data = &ntc_thermistor_id[1] },
170+
{ .compatible = "murata,ncp21wb473",
171+
.data = &ntc_thermistor_id[2] },
172+
{ .compatible = "murata,ncp03wb473",
173+
.data = &ntc_thermistor_id[3] },
174+
{ .compatible = "murata,ncp15wl333",
175+
.data = &ntc_thermistor_id[4] },
176+
177+
/* Usage of vendor name "ntc" is deprecated */
166178
{ .compatible = "ntc,ncp15wb473",
167179
.data = &ntc_thermistor_id[0] },
168180
{ .compatible = "ntc,ncp18wb473",
@@ -534,7 +546,7 @@ static struct platform_driver ntc_thermistor_driver = {
534546

535547
module_platform_driver(ntc_thermistor_driver);
536548

537-
MODULE_DESCRIPTION("NTC Thermistor Driver");
549+
MODULE_DESCRIPTION("NTC Thermistor Driver from Murata");
538550
MODULE_AUTHOR("MyungJoo Ham <[email protected]>");
539551
MODULE_LICENSE("GPL");
540552
MODULE_ALIAS("platform:ntc-thermistor");

0 commit comments

Comments
 (0)