| From 8bc9f2dccf20329b64674b86df303d9eff72b040 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Bj=C3=B6rn=20Gerhart?= <gerhart@posteo.de> |
| Date: Mon, 15 Jul 2019 18:33:55 +0200 |
| Subject: hwmon: (nct6775) Fix register address and added missed tolerance for |
| nct6106 |
| |
| [ Upstream commit f3d43e2e45fd9d44ba52d20debd12cd4ee9c89bf ] |
| |
| Fixed address of third NCT6106_REG_WEIGHT_DUTY_STEP, and |
| added missed NCT6106_REG_TOLERANCE_H. |
| |
| Fixes: 6c009501ff200 ("hwmon: (nct6775) Add support for NCT6102D/6106D") |
| Signed-off-by: Bjoern Gerhart <gerhart@posteo.de> |
| Signed-off-by: Guenter Roeck <linux@roeck-us.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/hwmon/nct6775.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c |
| index ca9941fa741b7..7e14143ed1191 100644 |
| --- a/drivers/hwmon/nct6775.c |
| +++ b/drivers/hwmon/nct6775.c |
| @@ -769,7 +769,7 @@ static const u16 NCT6106_REG_TARGET[] = { 0x111, 0x121, 0x131 }; |
| static const u16 NCT6106_REG_WEIGHT_TEMP_SEL[] = { 0x168, 0x178, 0x188 }; |
| static const u16 NCT6106_REG_WEIGHT_TEMP_STEP[] = { 0x169, 0x179, 0x189 }; |
| static const u16 NCT6106_REG_WEIGHT_TEMP_STEP_TOL[] = { 0x16a, 0x17a, 0x18a }; |
| -static const u16 NCT6106_REG_WEIGHT_DUTY_STEP[] = { 0x16b, 0x17b, 0x17c }; |
| +static const u16 NCT6106_REG_WEIGHT_DUTY_STEP[] = { 0x16b, 0x17b, 0x18b }; |
| static const u16 NCT6106_REG_WEIGHT_TEMP_BASE[] = { 0x16c, 0x17c, 0x18c }; |
| static const u16 NCT6106_REG_WEIGHT_DUTY_BASE[] = { 0x16d, 0x17d, 0x18d }; |
| |
| @@ -3592,6 +3592,7 @@ static int nct6775_probe(struct platform_device *pdev) |
| data->REG_FAN_TIME[0] = NCT6106_REG_FAN_STOP_TIME; |
| data->REG_FAN_TIME[1] = NCT6106_REG_FAN_STEP_UP_TIME; |
| data->REG_FAN_TIME[2] = NCT6106_REG_FAN_STEP_DOWN_TIME; |
| + data->REG_TOLERANCE_H = NCT6106_REG_TOLERANCE_H; |
| data->REG_PWM[0] = NCT6106_REG_PWM; |
| data->REG_PWM[1] = NCT6106_REG_FAN_START_OUTPUT; |
| data->REG_PWM[2] = NCT6106_REG_FAN_STOP_OUTPUT; |
| -- |
| 2.20.1 |
| |