From patchwork Tue Jun 24 12:19:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naveen Krishna Chatradhi X-Patchwork-Id: 4408491 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AB487BEEAA for ; Tue, 24 Jun 2014 12:28:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A75932034E for ; Tue, 24 Jun 2014 12:28:58 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 336EE20173 for ; Tue, 24 Jun 2014 12:28:55 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WzPna-0005wl-18; Tue, 24 Jun 2014 12:26:06 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WzPly-0003XG-4q for linux-arm-kernel@lists.infradead.org; Tue, 24 Jun 2014 12:24:27 +0000 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N7O003LBAG4MB00@mailout2.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 24 Jun 2014 21:24:04 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.123]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id A1.91.24374.4ED69A35; Tue, 24 Jun 2014 21:24:04 +0900 (KST) X-AuditID: cbfee68d-b7fd46d000005f36-e4-53a96de46e5a Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 79.4C.05196.4ED69A35; Tue, 24 Jun 2014 21:24:04 +0900 (KST) Received: from chnaveen-ubuntu.sisodomain.com ([107.108.83.161]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N7O00290ACZEN10@mmp1.samsung.com>; Tue, 24 Jun 2014 21:24:04 +0900 (KST) From: Naveen Krishna Chatradhi To: linux-samsung-soc@vger.kernel.org, linux-iio@vger.kernel.org Subject: [PATCH 2/4] hwmon: ntc_thermistor: Use the manufacturer name properly Date: Tue, 24 Jun 2014 17:49:14 +0530 Message-id: <1403612356-23685-3-git-send-email-ch.naveen@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1403612356-23685-1-git-send-email-ch.naveen@samsung.com> References: <1403612356-23685-1-git-send-email-ch.naveen@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpgkeLIzCtJLcpLzFFi42JZI2JSrfskd2WwwYKVyhYvD2lazD9yjtWi d8FVNoslk+ezWmx6fI3VYt6RdywWM87vY7J4svAMk8Wibf+ZHTg9ds66y+6xeUm9x5I3h1g9 dn5vYPfo27KK0ePzJrkAtigum5TUnMyy1CJ9uwSujM1HAgv+6Ve87f3N3MD4Qr2LkYNDQsBE YtlJ3S5GTiBTTOLCvfVsXYxcHEICSxklPvXeYYdImEicv/aGCSKxiFHi1IqjLBBOP5PEv0vX mUGq2ATMJA4uWs0OMlVEwEFiyVYDkBpmgUOMEu/XdDOB1AgL+ElMX3+UEaSGRUBVYsdkNZAw r4CrxJdJC9khDlKQmDPJBiTMKeAmcXjpbBYQWwio5EXjVLAbJATWsUuc3tDPCJJgERCQ+Db5 EAtEr6zEpgPMEDdLShxccYNlAqPwAkaGVYyiqQXJBcVJ6UWGesWJucWleel6yfm5mxiBoX/6 37PeHYy3D1gfYkwGGjeRWUo0OR8YO3kl8YbGZkYWpiamxkbmlmakCSuJ8yY9TAoSEkhPLEnN Tk0tSC2KLyrNSS0+xMjEwSnVwHhOQOaQoFnj9uNngg5vmpN5L8z452GGDWdESl62leXw3l5d ep7J1ajjE8uU5S4fX71ddDTC8l6PcqvyteLU9mv9mvbH9K+ZPCkXjcpbdIo/7M6J+ycXfZiz 9puO2JGK37ct5Qzefvov+lTU7tOdfC3xtiUnBGNWu9mGN4qETHCdxCLfmN/9RE2JpTgj0VCL uag4EQAUuM++kwIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrAIsWRmVeSWpSXmKPExsVy+t9jAd0nuSuDDXYukLJ4eUjTYv6Rc6wW vQuuslksmTyf1WLT42usFvOOvGOxmHF+H5PFk4VnmCwWbfvP7MDpsXPWXXaPzUvqPZa8OcTq sfN7A7tH35ZVjB6fN8kFsEU1MNpkpCampBYppOYl56dk5qXbKnkHxzvHm5oZGOoaWlqYKynk Jeam2iq5+AToumXmAB2lpFCWmFMKFApILC5W0rfDNCE0xE3XAqYxQtc3JAiux8gADSSsYczY fCSw4J9+xdve38wNjC/Uuxg5OSQETCTOX3vDBGGLSVy4t56ti5GLQ0hgEaPEqRVHWSCcfiaJ f5euM4NUsQmYSRxctJq9i5GDQ0TAQWLJVgOQGmaBQ4wS79d0g00SFvCTmL7+KCNIDYuAqsSO yWogYV4BV4kvkxaCtUoIKEjMmWQDEuYUcJM4vHQ2C4gtBFTyonEq0wRG3gWMDKsYRVMLkguK k9JzjfSKE3OLS/PS9ZLzczcxgmPrmfQOxlUNFocYBTgYlXh4IwJXBAuxJpYVV+YC3cLBrCTC +yVuZbAQb0piZVVqUX58UWlOavEhRlOgmyYyS4km5wPjPq8k3tDYxNzU2NTSxMLEzFJJnPdg q3WgkEB6YklqdmpqQWoRTB8TB6dUA+PcmrW8ho8FGu6yKR1wLV+cOVvhmUiafsMhCa212TsK 7/EdmB5plKjoF7TEKGn6xpltTZ5PPoi0XgkVvbl6vsZ/Ub2T5rWtny5WxZ4rkGw/rm2mMPtC pu5BeYfV7wTEz+73miFskKS891nu1Z7Ww8kSzFIq7+ct1+1oerGUn9tR0HnOOZsmdiWW4oxE Qy3mouJEALrNAcjDAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140624_052426_398980_9FC3CB47 X-CRM114-Status: GOOD ( 15.19 ) X-Spam-Score: -5.0 (-----) Cc: devicetree@vger.kernel.org, lars@metafoo.de, kgene.kim@samsung.com, Guenter Roeck , cpgs@samsung.com, naveenkrishna.ch@gmail.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Signed-off-by: Naveen Krishna Chatradhi Cc: Guenter Roeck --- This changes is needed for the following reasons 1. The vendor prefix "ntc" is not defined in vendor-prefixes.txt Thus, giving an error when checked with scripts/checkpatch.pl 2. Murata Manufacturing Co., Ltd. Is the vendor for the NTC (Negative Temperature Coefficient) based thermistors. Hence, "murata" is the right vendor-prefix, Not "ntc". 3. NTC is a technology used, But the prefix "ntc" is wrongly and heavily used in the driver and the documentation. .../devicetree/bindings/arm/samsung/exynos-adc.txt | 2 +- .../devicetree/bindings/hwmon/ntc_thermistor.txt | 12 ++++++------ Documentation/hwmon/ntc_thermistor | 8 ++++---- drivers/hwmon/Kconfig | 5 +++-- drivers/hwmon/ntc_thermistor.c | 12 ++++++------ 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt index 5d49f2b..832fe8c 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 { /* NTC thermistor is a hwmon device */ ncp15wb473@0 { - compatible = "ntc,ncp15wb473"; + compatible = "murata,ncp15wb473"; pullup-uv = <1800000>; pullup-ohm = <47000>; pulldown-ohm = <0>; diff --git a/Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt b/Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt index c6f6667..4e9f344 100644 --- a/Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt +++ b/Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt @@ -3,11 +3,11 @@ 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" - "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 +21,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>; diff --git a/Documentation/hwmon/ntc_thermistor b/Documentation/hwmon/ntc_thermistor index 3bfda94..057b770 100644 --- a/Documentation/hwmon/ntc_thermistor +++ b/Documentation/hwmon/ntc_thermistor @@ -1,7 +1,7 @@ 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. diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 08531a1..154851b 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -1052,7 +1052,7 @@ config SENSORS_PC87427 will be called pc87427. config SENSORS_NTC_THERMISTOR - tristate "NTC thermistor support" + tristate "NTC based 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. diff --git a/drivers/hwmon/ntc_thermistor.c b/drivers/hwmon/ntc_thermistor.c index e76feb86..6c38fc8 100644 --- a/drivers/hwmon/ntc_thermistor.c +++ b/drivers/hwmon/ntc_thermistor.c @@ -163,15 +163,15 @@ static int ntc_adc_iio_read(struct ntc_thermistor_platform_data *pdata) } static const struct of_device_id ntc_match[] = { - { .compatible = "ntc,ncp15wb473", + { .compatible = "murata,ncp15wb473", .data = &ntc_thermistor_id[0] }, - { .compatible = "ntc,ncp18wb473", + { .compatible = "murata,ncp18wb473", .data = &ntc_thermistor_id[1] }, - { .compatible = "ntc,ncp21wb473", + { .compatible = "murata,ncp21wb473", .data = &ntc_thermistor_id[2] }, - { .compatible = "ntc,ncp03wb473", + { .compatible = "murata,ncp03wb473", .data = &ntc_thermistor_id[3] }, - { .compatible = "ntc,ncp15wl333", + { .compatible = "murata,ncp15wl333", .data = &ntc_thermistor_id[4] }, { }, }; @@ -534,7 +534,7 @@ static struct platform_driver ntc_thermistor_driver = { module_platform_driver(ntc_thermistor_driver); -MODULE_DESCRIPTION("NTC Thermistor Driver"); +MODULE_DESCRIPTION("NTC based Thermistor Driver from Murata"); MODULE_AUTHOR("MyungJoo Ham "); MODULE_LICENSE("GPL"); MODULE_ALIAS("platform:ntc-thermistor");