2023-11-21 08:17:35

by Xing Tong Wu

Subject: [PATCH v3 0/2] hwmon: (nct6775) Fix pwm bugs for NCT chips

From: Xing Tong Wu <[email protected]>

These patches address bugs in the pwm features that do not meet the
specification definition.

changes since v2:
- Update commit message for 1/2 patch
- Extend 6106 arrays and remove 6116 arrays for PWM.

changes since v1:
- Add PWM mode and mask register arrays for NCT6116
- Delete 2nd patch for pwm_enable change
- Delete log print and add comment for pwm failure set

Xing Tong Wu (2):
hwmon: (nct6775) Add support for 2 additional fan controls
hwmon: (nct6775) Fix fan speed set failure in automatic mode

drivers/hwmon/nct6775-core.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)

--
2.25.1

2023-11-21 08:18:54

by Xing Tong Wu

Subject: [PATCH v3 1/2] hwmon: (nct6775) Add support for 2 additional fan controls

From: Xing Tong Wu <[email protected]>

The nct6116 has 2 additional PWM pins compared to the nct6106.
Extend the nct6106 PWM arrays to support the nct6116.

Signed-off-by: Xing Tong Wu <[email protected]>
---
drivers/hwmon/nct6775-core.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/hwmon/nct6775-core.c b/drivers/hwmon/nct6775-core.c
index d928eb8ae5a3..88300fb99bb9 100644
--- a/drivers/hwmon/nct6775-core.c
+++ b/drivers/hwmon/nct6775-core.c
@@ -767,9 +767,9 @@ static const u16 NCT6106_REG_FAN_MIN[] = { 0xe0, 0xe2, 0xe4 };
static const u16 NCT6106_REG_FAN_PULSES[] = { 0xf6, 0xf6, 0xf6 };
static const u16 NCT6106_FAN_PULSE_SHIFT[] = { 0, 2, 4 };

-static const u8 NCT6106_REG_PWM_MODE[] = { 0xf3, 0xf3, 0xf3 };
-static const u8 NCT6106_PWM_MODE_MASK[] = { 0x01, 0x02, 0x04 };
-static const u16 NCT6106_REG_PWM_READ[] = { 0x4a, 0x4b, 0x4c };
+static const u8 NCT6106_REG_PWM_MODE[] = { 0xf3, 0xf3, 0xf3, 0, 0 };
+static const u8 NCT6106_PWM_MODE_MASK[] = { 0x01, 0x02, 0x04, 0, 0 };
+static const u16 NCT6106_REG_PWM_READ[] = { 0x4a, 0x4b, 0x4c, 0xd8, 0xd9 };
static const u16 NCT6106_REG_FAN_MODE[] = { 0x113, 0x123, 0x133 };
static const u16 NCT6106_REG_TEMP_SOURCE[] = {
0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5 };
@@ -3595,7 +3595,7 @@ int nct6775_probe(struct device *dev, struct nct6775_data *data,
break;
case nct6116:
data->in_num = 9;
- data->pwm_num = 3;
+ data->pwm_num = 5;
data->auto_pwm_num = 4;
data->temp_fixed_num = 3;
data->num_temp_alarms = 3;
--
2.25.1

2023-11-21 15:59:35

by Guenter Roeck

Subject: Re: [PATCH v3 1/2] hwmon: (nct6775) Add support for 2 additional fan controls

On Tue, Nov 21, 2023 at 04:16:03PM +0800, Xing Tong Wu wrote:
> From: Xing Tong Wu <[email protected]>
>
> The nct6116 has 2 additional PWM pins compared to the nct6106.
> Extend the nct6106 PWM arrays to support the nct6116.
>
> Signed-off-by: Xing Tong Wu <[email protected]>

Applied.

Thanks,
Guenter