提交 7df70f8d 编写于 作者: Z Zev Weiss 提交者: Zheng Zengkai

hwmon: (pmbus/lm25066) Add offset coefficients

stable inclusion
from stable-5.10.80
commit 5b7e3bb16310e597aac1d35f1bf260143e8d5def
bugzilla: 185821 https://gitee.com/openeuler/kernel/issues/I4L7CG

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=5b7e3bb16310e597aac1d35f1bf260143e8d5def

--------------------------------

commit ae59dc45 upstream.

With the exception of the lm5066i, all the devices handled by this
driver had been missing their offset ('b') coefficients for direct
format readings.

Cc: stable@vger.kernel.org
Fixes: 58615a94 ("hwmon: (pmbus/lm25066) Add support for LM25056")
Fixes: e53e6497 ("hwmon: (pmbus/lm25066) Refactor device specific coefficients")
Signed-off-by: NZev Weiss <zev@bewilderbeest.net>
Link: https://lore.kernel.org/r/20210928092242.30036-2-zev@bewilderbeest.netSigned-off-by: NGuenter Roeck <linux@roeck-us.net>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Reviewed-by: NWeilong Chen <chenweilong@huawei.com>
Acked-by: NWeilong Chen <chenweilong@huawei.com>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 7bcb356d
...@@ -55,22 +55,27 @@ static struct __coeff lm25066_coeff[6][PSC_NUM_CLASSES + 2] = { ...@@ -55,22 +55,27 @@ static struct __coeff lm25066_coeff[6][PSC_NUM_CLASSES + 2] = {
[lm25056] = { [lm25056] = {
[PSC_VOLTAGE_IN] = { [PSC_VOLTAGE_IN] = {
.m = 16296, .m = 16296,
.b = 1343,
.R = -2, .R = -2,
}, },
[PSC_CURRENT_IN] = { [PSC_CURRENT_IN] = {
.m = 13797, .m = 13797,
.b = -1833,
.R = -2, .R = -2,
}, },
[PSC_CURRENT_IN_L] = { [PSC_CURRENT_IN_L] = {
.m = 6726, .m = 6726,
.b = -537,
.R = -2, .R = -2,
}, },
[PSC_POWER] = { [PSC_POWER] = {
.m = 5501, .m = 5501,
.b = -2908,
.R = -3, .R = -3,
}, },
[PSC_POWER_L] = { [PSC_POWER_L] = {
.m = 26882, .m = 26882,
.b = -5646,
.R = -4, .R = -4,
}, },
[PSC_TEMPERATURE] = { [PSC_TEMPERATURE] = {
...@@ -82,26 +87,32 @@ static struct __coeff lm25066_coeff[6][PSC_NUM_CLASSES + 2] = { ...@@ -82,26 +87,32 @@ static struct __coeff lm25066_coeff[6][PSC_NUM_CLASSES + 2] = {
[lm25066] = { [lm25066] = {
[PSC_VOLTAGE_IN] = { [PSC_VOLTAGE_IN] = {
.m = 22070, .m = 22070,
.b = -1800,
.R = -2, .R = -2,
}, },
[PSC_VOLTAGE_OUT] = { [PSC_VOLTAGE_OUT] = {
.m = 22070, .m = 22070,
.b = -1800,
.R = -2, .R = -2,
}, },
[PSC_CURRENT_IN] = { [PSC_CURRENT_IN] = {
.m = 13661, .m = 13661,
.b = -5200,
.R = -2, .R = -2,
}, },
[PSC_CURRENT_IN_L] = { [PSC_CURRENT_IN_L] = {
.m = 6852, .m = 6852,
.b = -3100,
.R = -2, .R = -2,
}, },
[PSC_POWER] = { [PSC_POWER] = {
.m = 736, .m = 736,
.b = -3300,
.R = -2, .R = -2,
}, },
[PSC_POWER_L] = { [PSC_POWER_L] = {
.m = 369, .m = 369,
.b = -1900,
.R = -2, .R = -2,
}, },
[PSC_TEMPERATURE] = { [PSC_TEMPERATURE] = {
...@@ -111,26 +122,32 @@ static struct __coeff lm25066_coeff[6][PSC_NUM_CLASSES + 2] = { ...@@ -111,26 +122,32 @@ static struct __coeff lm25066_coeff[6][PSC_NUM_CLASSES + 2] = {
[lm5064] = { [lm5064] = {
[PSC_VOLTAGE_IN] = { [PSC_VOLTAGE_IN] = {
.m = 4611, .m = 4611,
.b = -642,
.R = -2, .R = -2,
}, },
[PSC_VOLTAGE_OUT] = { [PSC_VOLTAGE_OUT] = {
.m = 4621, .m = 4621,
.b = 423,
.R = -2, .R = -2,
}, },
[PSC_CURRENT_IN] = { [PSC_CURRENT_IN] = {
.m = 10742, .m = 10742,
.b = 1552,
.R = -2, .R = -2,
}, },
[PSC_CURRENT_IN_L] = { [PSC_CURRENT_IN_L] = {
.m = 5456, .m = 5456,
.b = 2118,
.R = -2, .R = -2,
}, },
[PSC_POWER] = { [PSC_POWER] = {
.m = 1204, .m = 1204,
.b = 8524,
.R = -3, .R = -3,
}, },
[PSC_POWER_L] = { [PSC_POWER_L] = {
.m = 612, .m = 612,
.b = 11202,
.R = -3, .R = -3,
}, },
[PSC_TEMPERATURE] = { [PSC_TEMPERATURE] = {
...@@ -140,26 +157,32 @@ static struct __coeff lm25066_coeff[6][PSC_NUM_CLASSES + 2] = { ...@@ -140,26 +157,32 @@ static struct __coeff lm25066_coeff[6][PSC_NUM_CLASSES + 2] = {
[lm5066] = { [lm5066] = {
[PSC_VOLTAGE_IN] = { [PSC_VOLTAGE_IN] = {
.m = 4587, .m = 4587,
.b = -1200,
.R = -2, .R = -2,
}, },
[PSC_VOLTAGE_OUT] = { [PSC_VOLTAGE_OUT] = {
.m = 4587, .m = 4587,
.b = -2400,
.R = -2, .R = -2,
}, },
[PSC_CURRENT_IN] = { [PSC_CURRENT_IN] = {
.m = 10753, .m = 10753,
.b = -1200,
.R = -2, .R = -2,
}, },
[PSC_CURRENT_IN_L] = { [PSC_CURRENT_IN_L] = {
.m = 5405, .m = 5405,
.b = -600,
.R = -2, .R = -2,
}, },
[PSC_POWER] = { [PSC_POWER] = {
.m = 1204, .m = 1204,
.b = -6000,
.R = -3, .R = -3,
}, },
[PSC_POWER_L] = { [PSC_POWER_L] = {
.m = 605, .m = 605,
.b = -8000,
.R = -3, .R = -3,
}, },
[PSC_TEMPERATURE] = { [PSC_TEMPERATURE] = {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册