aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorNaveen Krishna Chatradhi <ch.naveen@samsung.com>2014-06-25 02:29:31 -0400
committerGuenter Roeck <linux@roeck-us.net>2014-06-25 10:09:13 -0400
commit8b6f5e0f19c3a28383a318edc4493875ae1d53dd (patch)
tree956e0114016aab1fed97c89f8f887aae2d77b444 /Documentation
parenteab2014421fee297e769d1e464875cbb73a36c2f (diff)
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 <ch.naveen@samsung.com> Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt2
-rw-r--r--Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt20
-rw-r--r--Documentation/hwmon/ntc_thermistor8
3 files changed, 19 insertions, 11 deletions
diff --git a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
index 5d49f2b37f68..832fe8cc24d7 100644
--- a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
+++ b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
@@ -48,7 +48,7 @@ adc@12D10000 {
48 48
49 /* NTC thermistor is a hwmon device */ 49 /* NTC thermistor is a hwmon device */
50 ncp15wb473@0 { 50 ncp15wb473@0 {
51 compatible = "ntc,ncp15wb473"; 51 compatible = "murata,ncp15wb473";
52 pullup-uv = <1800000>; 52 pullup-uv = <1800000>;
53 pullup-ohm = <47000>; 53 pullup-ohm = <47000>;
54 pulldown-ohm = <0>; 54 pulldown-ohm = <0>;
diff --git a/Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt b/Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt
index c6f66674f19c..b117b2e9e1a7 100644
--- a/Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt
+++ b/Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt
@@ -3,11 +3,19 @@ NTC Thermistor hwmon sensors
3 3
4Requires node properties: 4Requires node properties:
5- "compatible" value : one of 5- "compatible" value : one of
6 "ntc,ncp15wb473" 6 "murata,ncp15wb473"
7 "ntc,ncp18wb473" 7 "murata,ncp18wb473"
8 "ntc,ncp21wb473" 8 "murata,ncp21wb473"
9 "ntc,ncp03wb473" 9 "murata,ncp03wb473"
10 "ntc,ncp15wl333" 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
11- "pullup-uv" Pull up voltage in micro volts 19- "pullup-uv" Pull up voltage in micro volts
12- "pullup-ohm" Pull up resistor value in ohms 20- "pullup-ohm" Pull up resistor value in ohms
13- "pulldown-ohm" Pull down resistor value in ohms 21- "pulldown-ohm" Pull down resistor value in ohms
@@ -21,7 +29,7 @@ Read more about iio bindings at
21 29
22Example: 30Example:
23 ncp15wb473@0 { 31 ncp15wb473@0 {
24 compatible = "ntc,ncp15wb473"; 32 compatible = "murata,ncp15wb473";
25 pullup-uv = <1800000>; 33 pullup-uv = <1800000>;
26 pullup-ohm = <47000>; 34 pullup-ohm = <47000>;
27 pulldown-ohm = <0>; 35 pulldown-ohm = <0>;
diff --git a/Documentation/hwmon/ntc_thermistor b/Documentation/hwmon/ntc_thermistor
index 3bfda94096fd..057b77029f26 100644
--- a/Documentation/hwmon/ntc_thermistor
+++ b/Documentation/hwmon/ntc_thermistor
@@ -1,7 +1,7 @@
1Kernel driver ntc_thermistor 1Kernel driver ntc_thermistor
2================= 2=================
3 3
4Supported thermistors: 4Supported thermistors from Murata:
5* Murata NTC Thermistors NCP15WB473, NCP18WB473, NCP21WB473, NCP03WB473, NCP15WL333 5* Murata NTC Thermistors NCP15WB473, NCP18WB473, NCP21WB473, NCP03WB473, NCP15WL333
6 Prefixes: 'ncp15wb473', 'ncp18wb473', 'ncp21wb473', 'ncp03wb473', 'ncp15wl333' 6 Prefixes: 'ncp15wb473', 'ncp18wb473', 'ncp21wb473', 'ncp03wb473', 'ncp15wl333'
7 Datasheet: Publicly available at Murata 7 Datasheet: Publicly available at Murata
@@ -15,9 +15,9 @@ Authors:
15Description 15Description
16----------- 16-----------
17 17
18The NTC thermistor is a simple thermistor that requires users to provide the 18The NTC (Negative Temperature Coefficient) thermistor is a simple thermistor
19resistance and lookup the corresponding compensation table to get the 19that requires users to provide the resistance and lookup the corresponding
20temperature input. 20compensation table to get the temperature input.
21 21
22The NTC driver provides lookup tables with a linear approximation function 22The NTC driver provides lookup tables with a linear approximation function
23and four circuit models with an option not to use any of the four models. 23and four circuit models with an option not to use any of the four models.