| From 2b52278150c49559a472f2d6dd66f6f3b405378e Mon Sep 17 00:00:00 2001 |
| From: Steve Foreman <foremans@google.com> |
| Date: Fri, 2 Oct 2020 16:35:38 +0000 |
| Subject: hwmon: (pmbus/max34440) Fix OC fault limits |
| |
| From: Steve Foreman <foremans@google.com> |
| |
| commit 2b52278150c49559a472f2d6dd66f6f3b405378e upstream. |
| |
| The max34* family have the IOUT_OC_WARN_LIMIT and IOUT_OC_CRIT_LIMIT |
| registers swapped. |
| |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Steve Foreman <foremans@google.com> |
| [groeck: Updated subject, use C comment style, tab after defines] |
| [groeck: Added missing break; statements (by alexandru.ardelean@analog.com)] |
| Signed-off-by: Guenter Roeck <linux@roeck-us.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/hwmon/pmbus/max34440.c | 23 +++++++++++++++++++++++ |
| 1 file changed, 23 insertions(+) |
| |
| --- a/drivers/hwmon/pmbus/max34440.c |
| +++ b/drivers/hwmon/pmbus/max34440.c |
| @@ -31,6 +31,13 @@ enum chips { max34440, max34441, max3444 |
| #define MAX34440_STATUS_OT_FAULT BIT(5) |
| #define MAX34440_STATUS_OT_WARN BIT(6) |
| |
| +/* |
| + * The whole max344* family have IOUT_OC_WARN_LIMIT and IOUT_OC_FAULT_LIMIT |
| + * swapped from the standard pmbus spec addresses. |
| + */ |
| +#define MAX34440_IOUT_OC_WARN_LIMIT 0x46 |
| +#define MAX34440_IOUT_OC_FAULT_LIMIT 0x4A |
| + |
| #define MAX34451_MFR_CHANNEL_CONFIG 0xe4 |
| #define MAX34451_MFR_CHANNEL_CONFIG_SEL_MASK 0x3f |
| |
| @@ -49,6 +56,14 @@ static int max34440_read_word_data(struc |
| const struct max34440_data *data = to_max34440_data(info); |
| |
| switch (reg) { |
| + case PMBUS_IOUT_OC_FAULT_LIMIT: |
| + ret = pmbus_read_word_data(client, page, phase, |
| + MAX34440_IOUT_OC_FAULT_LIMIT); |
| + break; |
| + case PMBUS_IOUT_OC_WARN_LIMIT: |
| + ret = pmbus_read_word_data(client, page, phase, |
| + MAX34440_IOUT_OC_WARN_LIMIT); |
| + break; |
| case PMBUS_VIRT_READ_VOUT_MIN: |
| ret = pmbus_read_word_data(client, page, phase, |
| MAX34440_MFR_VOUT_MIN); |
| @@ -115,6 +130,14 @@ static int max34440_write_word_data(stru |
| int ret; |
| |
| switch (reg) { |
| + case PMBUS_IOUT_OC_FAULT_LIMIT: |
| + ret = pmbus_write_word_data(client, page, MAX34440_IOUT_OC_FAULT_LIMIT, |
| + word); |
| + break; |
| + case PMBUS_IOUT_OC_WARN_LIMIT: |
| + ret = pmbus_write_word_data(client, page, MAX34440_IOUT_OC_WARN_LIMIT, |
| + word); |
| + break; |
| case PMBUS_VIRT_RESET_POUT_HISTORY: |
| ret = pmbus_write_word_data(client, page, |
| MAX34446_MFR_POUT_PEAK, 0); |