hwmon: (pmbus/adm1275) add adm1281 support
Subsystems (2)
PATCH 1/2 hwmon: (pmbus/adm1275) add adm1281 support
From: Jose Ramon San Buenaventura <[email protected]>
Add support for adm1281 which is similar to adm1275 and other chips of the series.
Signed-off-by Jose Ramon San Buenaventura <[email protected]>
Signed-off-by Guenter Roeck <[email protected]>
(cherry picked from commit 916300902725b362d5008ee10825a39056f0b095)
--- Documentation/hwmon/adm1275.rst | 14 +++++++++++--- drivers/hwmon/pmbus/Kconfig | 4 ++-- drivers/hwmon/pmbus/adm1275.c | 7 +++++-- 3 files changed, 18 insertions(+), 7 deletions(-)
Documentation/hwmon/adm1275.rst +11 -3
@@ -43,6 +43,14 @@ Supported chips: Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1278.pdf + * Analog Devices ADM1281 + + Prefix: 'adm1281' + + Addresses scanned: - + + Datasheet: https://www.analog.com/media/en/technical-documentation/data-sheets/adm1281.pdf + * Analog Devices ADM1293/ADM1294 Prefix: 'adm1293', 'adm1294'
@@ -58,10 +66,10 @@ Description ----------- This driver supports hardware monitoring for Analog Devices ADM1075, ADM1272, -ADM1275, ADM1276, ADM1278, ADM1293, and ADM1294 Hot-Swap Controller and +ADM1275, ADM1276, ADM1278, ADM1281, ADM1293, and ADM1294 Hot-Swap Controller and Digital Power Monitors. -ADM1075, ADM1272, ADM1275, ADM1276, ADM1278, ADM1293, and ADM1294 are hot-swap +ADM1075, ADM1272, ADM1275, ADM1276, ADM1278, ADM1281, ADM1293, and ADM1294 are hot-swap controllers that allow a circuit board to be removed from or inserted into a live backplane. They also feature current and voltage readback via an integrated 12 bit analog-to-digital converter (ADC), accessed using a
@@ -144,5 +152,5 @@ temp1_highest Highest observed temperature. temp1_reset_history Write any value to reset history. Temperature attributes are supported on ADM1272 and - ADM1278. + ADM1278, and ADM1281. ======================= =======================================================
drivers/hwmon/pmbus/Kconfig +2 -2
@@ -51,8 +51,8 @@ config SENSORS_ADM1275 tristate "Analog Devices ADM1275 and compatibles" help If you say yes here you get hardware monitoring support for Analog - Devices ADM1075, ADM1272, ADM1275, ADM1276, ADM1278, ADM1293, - and ADM1294 Hot-Swap Controller and Digital Power Monitors. + Devices ADM1075, ADM1272, ADM1275, ADM1276, ADM1278, ADM1281, + ADM1293, and ADM1294 Hot-Swap Controller and Digital Power Monitors. This driver can also be built as a module. If so, the module will be called adm1275.
drivers/hwmon/pmbus/adm1275.c +5 -2
@@ -18,7 +18,7 @@#include <linux/log2.h> #include "pmbus.h" -enum chips { adm1075, adm1272, adm1275, adm1276, adm1278, adm1293, adm1294 }; +enum chips { adm1075, adm1272, adm1275, adm1276, adm1278, adm1281, adm1293, adm1294 };#define ADM1275_MFR_STATUS_IOUT_WARN2 BIT(0)#define ADM1293_MFR_STATUS_VAUX_UV_WARN BIT(5)
@@ -482,6 +482,7 @@ static const struct i2c_device_id adm1275_id[] = { { "adm1275", adm1275 }, { "adm1276", adm1276 }, { "adm1278", adm1278 }, + { "adm1281", adm1281 }, { "adm1293", adm1293 }, { "adm1294", adm1294 }, { }
@@ -555,7 +556,8 @@ static int adm1275_probe(struct i2c_client *client) client->name, mid->name);if (mid->driver_data == adm1272 || mid->driver_data == adm1278 || - mid->driver_data == adm1293 || mid->driver_data == adm1294) + mid->driver_data == adm1281 || mid->driver_data == adm1293 || + mid->driver_data == adm1294) config_read_fn = i2c_smbus_read_word_data;else config_read_fn = i2c_smbus_read_byte_data;
@@ -703,6 +705,7 @@ static int adm1275_probe(struct i2c_client *client)PMBUS_HAVE_VOUT |PMBUS_HAVE_STATUS_VOUT ;break ;case adm1278: +case adm1281: data->have_vout = true; data->have_pin_max = true; data->have_temp_max = true;
Signature · 1 line
2.25.1
PATCH 2/2 hwmon: (pmbus/adm1275) add adm1273 support
From: John Erasmus Mari Geronimo <[email protected]>
Add support for adm1273 which is similar to adm1275 and other chips of the series.
Signed-off-by John Erasmus Mari Geronimo <[email protected]>
Signed-off-by Guenter Roeck <[email protected]>
(cherry picked from commit adc52dd4078067fabf1431036ba180eafd8a7eee)
--- Documentation/hwmon/adm1275.rst | 28 ++++++++++++++++++---------- drivers/hwmon/pmbus/Kconfig | 2 +- drivers/hwmon/pmbus/adm1275.c | 10 ++++++---- 3 files changed, 25 insertions(+), 15 deletions(-)
Documentation/hwmon/adm1275.rst +18 -10
@@ -19,6 +19,14 @@ Supported chips: Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1272.pdf + * Analog Devices ADM1273 + + Prefix: 'adm1273' + + Addresses scanned: - + + Datasheet: Not yet publicly available + * Analog Devices ADM1275 Prefix: 'adm1275'
@@ -66,14 +74,14 @@ Description ----------- This driver supports hardware monitoring for Analog Devices ADM1075, ADM1272, -ADM1275, ADM1276, ADM1278, ADM1281, ADM1293, and ADM1294 Hot-Swap Controller and -Digital Power Monitors. +ADM1273, ADM1275, ADM1276, ADM1278, ADM1281, ADM1293, and ADM1294 Hot-Swap +Controller and Digital Power Monitors. -ADM1075, ADM1272, ADM1275, ADM1276, ADM1278, ADM1281, ADM1293, and ADM1294 are hot-swap -controllers that allow a circuit board to be removed from or inserted into -a live backplane. They also feature current and voltage readback via an -integrated 12 bit analog-to-digital converter (ADC), accessed using a -PMBus interface. +ADM1075, ADM1272, ADM1273, ADM1275, ADM1276, ADM1278, ADM1281, ADM1293, and +ADM1294 are hot-swap controllers that allow a circuit board to be removed from +or inserted into a live backplane. They also feature current and voltage +readback via an integrated 12 bit analog-to-digital converter (ADC), accessed +using a PMBus interface. The driver is a client driver to the core PMBus driver. Please see Documentation/hwmon/pmbus.rst for details on PMBus client drivers.
@@ -141,7 +149,7 @@ power1_input_highest Highest observed input power. power1_reset_history Write any value to reset history. Power attributes are supported on ADM1075, ADM1272, - ADM1276, ADM1293, and ADM1294. + ADM1273, ADM1276, ADM1293, and ADM1294. temp1_input Chip temperature. temp1_max Maximum chip temperature.
@@ -151,6 +159,6 @@ temp1_crit_alarm Critical temperature high alarm. temp1_highest Highest observed temperature. temp1_reset_history Write any value to reset history. - Temperature attributes are supported on ADM1272 and - ADM1278, and ADM1281. + Temperature attributes are supported on ADM1272, + ADM1273, ADM1278, and ADM1281. ======================= =======================================================
drivers/hwmon/pmbus/Kconfig +1 -1
@@ -51,7 +51,7 @@ config SENSORS_ADM1275 tristate "Analog Devices ADM1275 and compatibles" help If you say yes here you get hardware monitoring support for Analog - Devices ADM1075, ADM1272, ADM1275, ADM1276, ADM1278, ADM1281, + Devices ADM1075, ADM1272, ADM1273, ADM1275, ADM1276, ADM1278, ADM1281, ADM1293, and ADM1294 Hot-Swap Controller and Digital Power Monitors. This driver can also be built as a module. If so, the module will
drivers/hwmon/pmbus/adm1275.c +6 -4
@@ -18,7 +18,7 @@#include <linux/log2.h> #include "pmbus.h" -enum chips { adm1075, adm1272, adm1275, adm1276, adm1278, adm1281, adm1293, adm1294 }; +enum chips { adm1075, adm1272, adm1273, adm1275, adm1276, adm1278, adm1281, adm1293, adm1294 };#define ADM1275_MFR_STATUS_IOUT_WARN2 BIT(0)#define ADM1293_MFR_STATUS_VAUX_UV_WARN BIT(5)
@@ -479,6 +479,7 @@ static int adm1275_read_byte_data(struct i2c_client *client, int page, int reg)static const struct i2c_device_id adm1275_id[] = { {"adm1075" , adm1075 }, {"adm1272" , adm1272 }, + {"adm1273" , adm1273 }, {"adm1275" , adm1275 }, {"adm1276" , adm1276 }, {"adm1278" , adm1278 },
@@ -555,9 +556,9 @@ static int adm1275_probe(struct i2c_client *client)"Device mismatch: Configured %s, detected %s\n" , client->name, mid->name); -if (mid->driver_data == adm1272 || mid->driver_data == adm1278 || - mid->driver_data == adm1281 || mid->driver_data == adm1293 || - mid->driver_data == adm1294) +if (mid->driver_data == adm1272 || mid->driver_data == adm1273 || + mid->driver_data == adm1278 || mid->driver_data == adm1281 || + mid->driver_data == adm1293 || mid->driver_data == adm1294) config_read_fn = i2c_smbus_read_word_data;else config_read_fn = i2c_smbus_read_byte_data;
@@ -630,6 +631,7 @@ static int adm1275_probe(struct i2c_client *client)PMBUS_HAVE_VOUT |PMBUS_HAVE_STATUS_VOUT ;break ;case adm1272: +case adm1273: data->have_vout = true; data->have_pin_max = true; data->have_temp_max = true;
Signature · 1 line
2.25.1
Andrew Jeffery
AppliedHi Allan,
I've applied both patches in your series to dev-6.6.
Andrew
Quoted 14 lines · Allen.Wang
From: Jose Ramon San Buenaventura <[email protected]>
Add support for adm1281 which is similar to adm1275 and other chips of the series.
Signed-off-by Jose Ramon San Buenaventura <[email protected]>Signed-off-by Guenter Roeck <[email protected]>(cherry picked from commit 916300902725b362d5008ee10825a39056f0b095)---
Documentation/hwmon/adm1275.rst | 14 +++++++++++--- drivers/hwmon/pmbus/Kconfig | 4 ++-- drivers/hwmon/pmbus/adm1275.c | 7 +++++--3 files changed, 18 insertions(+), 7 deletions(-)