From: Guenter Roeck <linux@roeck-us.net>
To: Amy.Shih@advantech.com.tw
Cc: she90122@gmail.com, oakley.ding@advantech.com.tw,
Jean Delvare <jdelvare@suse.com>,
linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [v1,1/1] hwmon: (nct7904) Fix the incorrect value of vsen_mask & tcpu_mask & temp_mode in nct7904_data struct.
Date: Sun, 20 Oct 2019 09:23:25 -0700 [thread overview]
Message-ID: <20191020162325.GA16156@roeck-us.net> (raw)
In-Reply-To: <20191014082451.2895-1-Amy.Shih@advantech.com.tw>
On Mon, Oct 14, 2019 at 04:24:51PM +0800, Amy.Shih@advantech.com.tw wrote:
> From: "amy.shih" <amy.shih@advantech.com.tw>
>
> Voltage sensors overlap with external temperature sensors. Detect
> the multi-function of voltage, thermal diode, thermistor and
> reserved from register VT_ADC_MD_REG to set value of vsen_mask &
> tcpu_mask & temp_mode in nct7904_data struct. If the value is
> reserved, needs to disable the vsen_mask & tcpu_mask.
>
> Signed-off-by: amy.shih <amy.shih@advantech.com.tw>
Applied.
Thanks,
Guenter
> ---
> drivers/hwmon/nct7904.c | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c
> index b26419dbe840..281c81edabc6 100644
> --- a/drivers/hwmon/nct7904.c
> +++ b/drivers/hwmon/nct7904.c
> @@ -82,6 +82,10 @@
> #define FANCTL1_FMR_REG 0x00 /* Bank 3; 1 reg per channel */
> #define FANCTL1_OUT_REG 0x10 /* Bank 3; 1 reg per channel */
>
> +#define VOLT_MONITOR_MODE 0x0
> +#define THERMAL_DIODE_MODE 0x1
> +#define THERMISTOR_MODE 0x3
> +
> #define ENABLE_TSI BIT(1)
>
> static const unsigned short normal_i2c[] = {
> @@ -935,11 +939,16 @@ static int nct7904_probe(struct i2c_client *client,
> for (i = 0; i < 4; i++) {
> val = (ret >> (i * 2)) & 0x03;
> bit = (1 << i);
> - if (val == 0) {
> + if (val == VOLT_MONITOR_MODE) {
> data->tcpu_mask &= ~bit;
> + } else if (val == THERMAL_DIODE_MODE && i < 2) {
> + data->temp_mode |= bit;
> + data->vsen_mask &= ~(0x06 << (i * 2));
> + } else if (val == THERMISTOR_MODE) {
> + data->vsen_mask &= ~(0x02 << (i * 2));
> } else {
> - if (val == 0x1 || val == 0x2)
> - data->temp_mode |= bit;
> + /* Reserved */
> + data->tcpu_mask &= ~bit;
> data->vsen_mask &= ~(0x06 << (i * 2));
> }
> }
prev parent reply other threads:[~2019-10-20 16:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-14 8:24 [v1,1/1] hwmon: (nct7904) Fix the incorrect value of vsen_mask & tcpu_mask & temp_mode in nct7904_data struct Amy.Shih
2019-10-20 16:23 ` Guenter Roeck [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=20191020162325.GA16156@roeck-us.net \
--to=linux@roeck-us.net \
--cc=Amy.Shih@advantech.com.tw \
--cc=jdelvare@suse.com \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--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).