From: <Amy.Shih@advantech.com.tw>
To: <she90122@gmail.com>
Cc: <amy.shih@advantech.com.tw>, <oakley.ding@advantech.com.tw>,
<jia.sui@advantech.com.cn>, Jean Delvare <jdelvare@suse.com>,
Guenter Roeck <linux@roeck-us.net>, <linux-hwmon@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: [v2 9/9] hwmon: (nct7904) Fix wrong registers setting for temperature.
Date: Mon, 17 Jun 2019 08:22:55 +0000 [thread overview]
Message-ID: <9b03a23bbb5385658c21bf5129a5b1c9b5065237.1560756733.git.amy.shih@advantech.com.tw> (raw)
In-Reply-To: <928e46508bbe1ebc0763c3d2403a5aebe95af552.1560756733.git.amy.shih@advantech.com.tw>
From: "amy.shih" <amy.shih@advantech.com.tw>
For "attributes temp[1-*]_max" and "temp[1-*]_max_hyst", should
show the reading of "WARNING TEMPERATURE" and "WARNING TEMPERATURE
HYSTERESIS" registers. For attribute "temp[1-*]_crit" and
"temp[1-*]_crit_hyst", shuld show the reading of "CRITICAL TEMPERATURE"
and "CRITICAL TEMPERATURE HYSTERESIS" registers in datasheet.
Signed-off-by: amy.shih <amy.shih@advantech.com.tw>
---
Changes in v2:
- Fix wrong registers setting for temperature.
drivers/hwmon/nct7904.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c
index fc145c73a4e7..d842c10ba11f 100644
--- a/drivers/hwmon/nct7904.c
+++ b/drivers/hwmon/nct7904.c
@@ -399,23 +399,23 @@ static int nct7904_read_temp(struct device *dev, u32 attr, int channel,
return 0;
case hwmon_temp_max:
reg1 = LTD_HV_HL_REG;
- reg2 = TEMP_CH1_C_REG;
- reg3 = DTS_T_CPU1_C_REG;
+ reg2 = TEMP_CH1_W_REG;
+ reg3 = DTS_T_CPU1_W_REG;
break;
case hwmon_temp_max_hyst:
reg1 = LTD_LV_HL_REG;
- reg2 = TEMP_CH1_CH_REG;
- reg3 = DTS_T_CPU1_CH_REG;
+ reg2 = TEMP_CH1_WH_REG;
+ reg3 = DTS_T_CPU1_WH_REG;
break;
case hwmon_temp_crit:
reg1 = LTD_HV_LL_REG;
- reg2 = TEMP_CH1_W_REG;
- reg3 = DTS_T_CPU1_W_REG;
+ reg2 = TEMP_CH1_C_REG;
+ reg3 = DTS_T_CPU1_C_REG;
break;
case hwmon_temp_crit_hyst:
reg1 = LTD_LV_LL_REG;
- reg2 = TEMP_CH1_WH_REG;
- reg3 = DTS_T_CPU1_WH_REG;
+ reg2 = TEMP_CH1_CH_REG;
+ reg3 = DTS_T_CPU1_CH_REG;
break;
default:
return -EOPNOTSUPP;
@@ -508,23 +508,23 @@ static int nct7904_write_temp(struct device *dev, u32 attr, int channel,
switch (attr) {
case hwmon_temp_max:
reg1 = LTD_HV_HL_REG;
- reg2 = TEMP_CH1_C_REG;
- reg3 = DTS_T_CPU1_C_REG;
+ reg2 = TEMP_CH1_W_REG;
+ reg3 = DTS_T_CPU1_W_REG;
break;
case hwmon_temp_max_hyst:
reg1 = LTD_LV_HL_REG;
- reg2 = TEMP_CH1_CH_REG;
- reg3 = DTS_T_CPU1_CH_REG;
+ reg2 = TEMP_CH1_WH_REG;
+ reg3 = DTS_T_CPU1_WH_REG;
break;
case hwmon_temp_crit:
reg1 = LTD_HV_LL_REG;
- reg2 = TEMP_CH1_W_REG;
- reg3 = DTS_T_CPU1_W_REG;
+ reg2 = TEMP_CH1_C_REG;
+ reg3 = DTS_T_CPU1_C_REG;
break;
case hwmon_temp_crit_hyst:
reg1 = LTD_LV_LL_REG;
- reg2 = TEMP_CH1_WH_REG;
- reg3 = DTS_T_CPU1_WH_REG;
+ reg2 = TEMP_CH1_CH_REG;
+ reg3 = DTS_T_CPU1_CH_REG;
break;
default:
return -EOPNOTSUPP;
--
2.17.1
prev parent reply other threads:[~2019-06-17 8:23 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-17 8:08 [v2 1/9] hwmon: (nct7904) Add error handling in probe function Amy.Shih
2019-06-17 8:10 ` [v2 2/9] hwmon: (nct7904) Changes comments " Amy.Shih
2019-06-17 8:11 ` [v2 3/9] hwmon: (nct7904) Add extra sysfs support for fan, voltage and temperature Amy.Shih
2019-06-17 8:11 ` [v2 4/9] hwmon: (nct7904) Fix incorrect register setting for the high value high limit of voltage Amy.Shih
2019-06-17 8:12 ` [v2 5/9] hwmon: (nct7904) Fix incorrect register bit mapping of temperature alarm Amy.Shih
2019-06-17 8:14 ` [v2 6/9] hwmon: (nct7904) Fix wrong return code in function nct7904_write_fan Amy.Shih
2019-06-17 8:15 ` [v2 7/9] hwmon: (nct7904) Delete wrong comment in function nct7904_write_in Amy.Shih
2019-06-17 8:16 ` [v2 8/9] hwmon: (nct7904) Fix wrong attribute names for temperature Amy.Shih
2019-06-17 8:20 ` Amy.Shih
2019-06-17 8:22 ` Amy.Shih [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9b03a23bbb5385658c21bf5129a5b1c9b5065237.1560756733.git.amy.shih@advantech.com.tw \
--to=amy.shih@advantech.com.tw \
--cc=jdelvare@suse.com \
--cc=jia.sui@advantech.com.cn \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=oakley.ding@advantech.com.tw \
--cc=she90122@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).