* [v1,1/1] Fix the incorrect quantity for fan & temp attributes.
@ 2020-03-12 2:49 Amy.Shih
2020-03-15 13:37 ` Guenter Roeck
0 siblings, 1 reply; 2+ messages in thread
From: Amy.Shih @ 2020-03-12 2:49 UTC (permalink / raw)
To: she90122
Cc: Jean Delvare, Guenter Roeck, linux-hwmon, linux-kernel, amy.shih,
oakley.ding, jia.sui, yuechao.zhao
From: Amy Shih <amy.shih@advantech.com.tw>
nct7904d supports 12 fan tachometers input and 13 temperatures
(TEMP_CH1~4 and LTD + DTS TCPU1~8), fix the quantity for fan & temp
attributes.
Signed-off-by: Amy Shih <amy.shih@advantech.com.tw>
---
drivers/hwmon/nct7904.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c
index 281c81e..1f5743d 100644
--- a/drivers/hwmon/nct7904.c
+++ b/drivers/hwmon/nct7904.c
@@ -7,6 +7,11 @@
*
* Copyright (c) 2019 Advantech
* Author: Amy.Shih <amy.shih@advantech.com.tw>
+ *
+ * Supports the following chips:
+ *
+ * Chip #vin #fan #pwm #temp #dts chip ID
+ * nct7904d 20 12 4 5 8 0xc5
*/
#include <linux/module.h>
@@ -820,6 +825,10 @@ static int nct7904_detect(struct i2c_client *client,
HWMON_F_INPUT | HWMON_F_MIN | HWMON_F_ALARM,
HWMON_F_INPUT | HWMON_F_MIN | HWMON_F_ALARM,
HWMON_F_INPUT | HWMON_F_MIN | HWMON_F_ALARM,
+ HWMON_F_INPUT | HWMON_F_MIN | HWMON_F_ALARM,
+ HWMON_F_INPUT | HWMON_F_MIN | HWMON_F_ALARM,
+ HWMON_F_INPUT | HWMON_F_MIN | HWMON_F_ALARM,
+ HWMON_F_INPUT | HWMON_F_MIN | HWMON_F_ALARM,
HWMON_F_INPUT | HWMON_F_MIN | HWMON_F_ALARM),
HWMON_CHANNEL_INFO(pwm,
HWMON_PWM_INPUT | HWMON_PWM_ENABLE,
@@ -853,6 +862,18 @@ static int nct7904_detect(struct i2c_client *client,
HWMON_T_CRIT_HYST,
HWMON_T_INPUT | HWMON_T_ALARM | HWMON_T_MAX |
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_CRIT |
+ HWMON_T_CRIT_HYST,
+ HWMON_T_INPUT | HWMON_T_ALARM | HWMON_T_MAX |
+ 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_CRIT |
+ HWMON_T_CRIT_HYST,
+ HWMON_T_INPUT | HWMON_T_ALARM | HWMON_T_MAX |
+ HWMON_T_MAX_HYST | HWMON_T_TYPE | HWMON_T_CRIT |
HWMON_T_CRIT_HYST),
NULL
};
--
1.8.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [v1,1/1] Fix the incorrect quantity for fan & temp attributes.
2020-03-12 2:49 [v1,1/1] Fix the incorrect quantity for fan & temp attributes Amy.Shih
@ 2020-03-15 13:37 ` Guenter Roeck
0 siblings, 0 replies; 2+ messages in thread
From: Guenter Roeck @ 2020-03-15 13:37 UTC (permalink / raw)
To: Amy.Shih
Cc: she90122, Jean Delvare, linux-hwmon, linux-kernel, oakley.ding,
jia.sui, yuechao.zhao
On Thu, Mar 12, 2020 at 02:49:34AM +0000, Amy.Shih@advantech.com.tw wrote:
> From: Amy Shih <amy.shih@advantech.com.tw>
>
> nct7904d supports 12 fan tachometers input and 13 temperatures
> (TEMP_CH1~4 and LTD + DTS TCPU1~8), fix the quantity for fan & temp
> attributes.
>
> Signed-off-by: Amy Shih <amy.shih@advantech.com.tw>
Applied.
Thanks,
Guenter
> ---
> drivers/hwmon/nct7904.c | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
> diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c
> index 281c81e..1f5743d 100644
> --- a/drivers/hwmon/nct7904.c
> +++ b/drivers/hwmon/nct7904.c
> @@ -7,6 +7,11 @@
> *
> * Copyright (c) 2019 Advantech
> * Author: Amy.Shih <amy.shih@advantech.com.tw>
> + *
> + * Supports the following chips:
> + *
> + * Chip #vin #fan #pwm #temp #dts chip ID
> + * nct7904d 20 12 4 5 8 0xc5
> */
>
> #include <linux/module.h>
> @@ -820,6 +825,10 @@ static int nct7904_detect(struct i2c_client *client,
> HWMON_F_INPUT | HWMON_F_MIN | HWMON_F_ALARM,
> HWMON_F_INPUT | HWMON_F_MIN | HWMON_F_ALARM,
> HWMON_F_INPUT | HWMON_F_MIN | HWMON_F_ALARM,
> + HWMON_F_INPUT | HWMON_F_MIN | HWMON_F_ALARM,
> + HWMON_F_INPUT | HWMON_F_MIN | HWMON_F_ALARM,
> + HWMON_F_INPUT | HWMON_F_MIN | HWMON_F_ALARM,
> + HWMON_F_INPUT | HWMON_F_MIN | HWMON_F_ALARM,
> HWMON_F_INPUT | HWMON_F_MIN | HWMON_F_ALARM),
> HWMON_CHANNEL_INFO(pwm,
> HWMON_PWM_INPUT | HWMON_PWM_ENABLE,
> @@ -853,6 +862,18 @@ static int nct7904_detect(struct i2c_client *client,
> HWMON_T_CRIT_HYST,
> HWMON_T_INPUT | HWMON_T_ALARM | HWMON_T_MAX |
> 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_CRIT |
> + HWMON_T_CRIT_HYST,
> + HWMON_T_INPUT | HWMON_T_ALARM | HWMON_T_MAX |
> + 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_CRIT |
> + HWMON_T_CRIT_HYST,
> + HWMON_T_INPUT | HWMON_T_ALARM | HWMON_T_MAX |
> + HWMON_T_MAX_HYST | HWMON_T_TYPE | HWMON_T_CRIT |
> HWMON_T_CRIT_HYST),
> NULL
> };
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-15 13:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-12 2:49 [v1,1/1] Fix the incorrect quantity for fan & temp attributes Amy.Shih
2020-03-15 13:37 ` Guenter Roeck
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).