From patchwork Mon Jun 17 08:16:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amy.Shih@advantech.com.tw X-Patchwork-Id: 10998333 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6F1B714BB for ; Mon, 17 Jun 2019 08:22:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 62C41288A9 for ; Mon, 17 Jun 2019 08:22:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 60994288AE; Mon, 17 Jun 2019 08:22:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,UPPERCASE_50_75 autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E4CAA288A2 for ; Mon, 17 Jun 2019 08:22:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726121AbfFQIWR (ORCPT ); Mon, 17 Jun 2019 04:22:17 -0400 Received: from aclms3.advantech.com.tw ([125.252.70.86]:40383 "EHLO ACLMS3.advantech.com.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725791AbfFQIWR (ORCPT ); Mon, 17 Jun 2019 04:22:17 -0400 Received: from taipei08.ADVANTECH.CORP (unverified [172.20.0.235]) by ACLMS3.advantech.com.tw (Clearswift SMTPRS 5.6.0) with ESMTP id ; Mon, 17 Jun 2019 16:16:23 +0800 From: To: CC: , , , Jean Delvare , Guenter Roeck , , Subject: [v2 8/9] hwmon: (nct7904) Fix wrong attribute names for temperature. Date: Mon, 17 Jun 2019 08:16:09 +0000 Message-ID: X-Mailer: git-send-email 2.17.1 In-Reply-To: <928e46508bbe1ebc0763c3d2403a5aebe95af552.1560756733.git.amy.shih@advantech.com.tw> References: <928e46508bbe1ebc0763c3d2403a5aebe95af552.1560756733.git.amy.shih@advantech.com.tw> MIME-Version: 1.0 X-Originating-IP: [172.17.10.58] X-ClientProxiedBy: ACLDAG.ADVANTECH.CORP (172.20.2.88) To taipei08.ADVANTECH.CORP (172.20.0.235) X-StopIT: No Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "amy.shih" Emergency attributes without crit attributes are not acceptable. In datasheet there are registers labeled "critical", and there is no mention of "emergency". Thus, set the attribute names from "temp[1-*]_emergency" and "temp[1-*]_emergency_hyst" to "temp[1-*]_crit" and "temp[1-*]_crit_hyst". Signed-off-by: amy.shih --- Changes in v2: - Fix wrong attribute names for temperature. drivers/hwmon/nct7904.c | 48 ++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c index c74f919c0181..fc145c73a4e7 100644 --- a/drivers/hwmon/nct7904.c +++ b/drivers/hwmon/nct7904.c @@ -407,12 +407,12 @@ static int nct7904_read_temp(struct device *dev, u32 attr, int channel, reg2 = TEMP_CH1_CH_REG; reg3 = DTS_T_CPU1_CH_REG; break; - case hwmon_temp_emergency: + case hwmon_temp_crit: reg1 = LTD_HV_LL_REG; reg2 = TEMP_CH1_W_REG; reg3 = DTS_T_CPU1_W_REG; break; - case hwmon_temp_emergency_hyst: + case hwmon_temp_crit_hyst: reg1 = LTD_LV_LL_REG; reg2 = TEMP_CH1_WH_REG; reg3 = DTS_T_CPU1_WH_REG; @@ -454,8 +454,8 @@ static umode_t nct7904_temp_is_visible(const void *_data, u32 attr, int channel) break; case hwmon_temp_max: case hwmon_temp_max_hyst: - case hwmon_temp_emergency: - case hwmon_temp_emergency_hyst: + case hwmon_temp_crit: + case hwmon_temp_crit_hyst: if (channel < 5) { if (data->tcpu_mask & BIT(channel)) return 0644; @@ -516,12 +516,12 @@ static int nct7904_write_temp(struct device *dev, u32 attr, int channel, reg2 = TEMP_CH1_CH_REG; reg3 = DTS_T_CPU1_CH_REG; break; - case hwmon_temp_emergency: + case hwmon_temp_crit: reg1 = LTD_HV_LL_REG; reg2 = TEMP_CH1_W_REG; reg3 = DTS_T_CPU1_W_REG; break; - case hwmon_temp_emergency_hyst: + case hwmon_temp_crit_hyst: reg1 = LTD_LV_LL_REG; reg2 = TEMP_CH1_WH_REG; reg3 = DTS_T_CPU1_WH_REG; @@ -799,32 +799,32 @@ static const struct hwmon_channel_info *nct7904_info[] = { HWMON_PWM_INPUT | HWMON_PWM_ENABLE), HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT | HWMON_T_ALARM | HWMON_T_MAX | - HWMON_T_MAX_HYST | HWMON_T_TYPE | HWMON_T_EMERGENCY | - HWMON_T_EMERGENCY_HYST, + HWMON_T_MAX_HYST | HWMON_T_TYPE | HWMON_T_CRIT | + HWMON_T_CRIT_HYST, HWMON_T_INPUT | HWMON_T_ALARM | HWMON_T_MAX | - HWMON_T_MAX_HYST | HWMON_T_TYPE | HWMON_T_EMERGENCY | - HWMON_T_EMERGENCY_HYST, + HWMON_T_MAX_HYST | HWMON_T_TYPE | HWMON_T_CRIT | + HWMON_T_CRIT_HYST, HWMON_T_INPUT | HWMON_T_ALARM | HWMON_T_MAX | - HWMON_T_MAX_HYST | HWMON_T_TYPE | HWMON_T_EMERGENCY | - HWMON_T_EMERGENCY_HYST, + HWMON_T_MAX_HYST | HWMON_T_TYPE | HWMON_T_CRIT | + HWMON_T_CRIT_HYST, HWMON_T_INPUT | HWMON_T_ALARM | HWMON_T_MAX | - HWMON_T_MAX_HYST | HWMON_T_TYPE | HWMON_T_EMERGENCY | - HWMON_T_EMERGENCY_HYST, + HWMON_T_MAX_HYST | HWMON_T_TYPE | HWMON_T_CRIT | + HWMON_T_CRIT_HYST, HWMON_T_INPUT | HWMON_T_ALARM | HWMON_T_MAX | - HWMON_T_MAX_HYST | HWMON_T_TYPE | HWMON_T_EMERGENCY | - HWMON_T_EMERGENCY_HYST, + HWMON_T_MAX_HYST | HWMON_T_TYPE | HWMON_T_CRIT | + HWMON_T_CRIT_HYST, HWMON_T_INPUT | HWMON_T_ALARM | HWMON_T_MAX | - HWMON_T_MAX_HYST | HWMON_T_TYPE | HWMON_T_EMERGENCY | - HWMON_T_EMERGENCY_HYST, + HWMON_T_MAX_HYST | HWMON_T_TYPE | HWMON_T_CRIT | + HWMON_T_CRIT_HYST, HWMON_T_INPUT | HWMON_T_ALARM | HWMON_T_MAX | - HWMON_T_MAX_HYST | HWMON_T_TYPE | HWMON_T_EMERGENCY | - HWMON_T_EMERGENCY_HYST, + HWMON_T_MAX_HYST | HWMON_T_TYPE | HWMON_T_CRIT | + HWMON_T_CRIT_HYST, HWMON_T_INPUT | HWMON_T_ALARM | HWMON_T_MAX | - HWMON_T_MAX_HYST | HWMON_T_TYPE | HWMON_T_EMERGENCY | - HWMON_T_EMERGENCY_HYST, + HWMON_T_MAX_HYST | HWMON_T_TYPE | HWMON_T_CRIT | + HWMON_T_CRIT_HYST, HWMON_T_INPUT | HWMON_T_ALARM | HWMON_T_MAX | - HWMON_T_MAX_HYST | HWMON_T_TYPE | HWMON_T_EMERGENCY | - HWMON_T_EMERGENCY_HYST), + HWMON_T_MAX_HYST | HWMON_T_TYPE | HWMON_T_CRIT | + HWMON_T_CRIT_HYST), NULL };