Skip to content

[202405] Integrate HW-MGMT 7.0040.1008 Changes #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saiarcot895 merged 2 commits into from
Aug 30, 2024
Merged

[202405] Integrate HW-MGMT 7.0040.1008 Changes #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39ece62
Uncomment mellanox patches
vivekrnv Aug 21, 2024
6c47eb0
Integrate HW-MGMT 7.0040.1008 Changes
vivekrnv Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 0 additions & 39 deletions patch/0036-mlxsw-i2c-Fix-chunk-size-setting-in-output-mailbox-b.patch
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions patch/0037-mlxsw-i2c-Limit-single-transaction-buffer-size.patch
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions patch/0038-mlxsw-core_hwmon-Adjust-module-label-names-based-on-.patch
View file
Open in desktop

This file was deleted.

21 changes: 12 additions & 9 deletions patch/0048-hwmon-pmbus-Add-support-for-MPS-Multi-phase-mp2891-c.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ Signed-off-by: Vadim Pasternak <[email protected]>
Documentation/hwmon/mp2891.rst | 128 ++++++++++
drivers/hwmon/pmbus/Kconfig | 9 +
drivers/hwmon/pmbus/Makefile | 1 +
drivers/hwmon/pmbus/mp2891.c | 424 +++++++++++++++++++++++++++++++++
4 files changed, 562 insertions(+)
drivers/hwmon/pmbus/mp2891.c | 427 +++++++++++++++++++++++++++++++++
4 files changed, 565 insertions(+)
create mode 100644 Documentation/hwmon/mp2891.rst
create mode 100644 drivers/hwmon/pmbus/mp2891.c

diff --git a/Documentation/hwmon/mp2891.rst b/Documentation/hwmon/mp2891.rst
new file mode 100644
index 000000000000..c4bda3d7ee8a
index 000000000..c4bda3d7e
--- /dev/null
+++ b/Documentation/hwmon/mp2891.rst
@@ -0,0 +1,128 @@
Expand Down Expand Up @@ -164,7 +164,7 @@ index 000000000000..c4bda3d7ee8a
+
+**temp1_max_alarm**
diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig
index 89668af67206..77d67344cee4 100644
index 89668af67..77d67344c 100644
--- a/drivers/hwmon/pmbus/Kconfig
+++ b/drivers/hwmon/pmbus/Kconfig
@@ -299,6 +299,15 @@ config SENSORS_MP2888
Expand All @@ -184,7 +184,7 @@ index 89668af67206..77d67344cee4 100644
tristate "MPS MP2975"
help
diff --git a/drivers/hwmon/pmbus/Makefile b/drivers/hwmon/pmbus/Makefile
index 0002dbe22d52..8e767d7b8c5b 100644
index 0002dbe22..8e767d7b8 100644
--- a/drivers/hwmon/pmbus/Makefile
+++ b/drivers/hwmon/pmbus/Makefile
@@ -32,6 +32,7 @@ obj-$(CONFIG_SENSORS_MAX31785) += max31785.o
Expand All @@ -197,10 +197,10 @@ index 0002dbe22d52..8e767d7b8c5b 100644
obj-$(CONFIG_SENSORS_PLI1209BC) += pli1209bc.o
diff --git a/drivers/hwmon/pmbus/mp2891.c b/drivers/hwmon/pmbus/mp2891.c
new file mode 100644
index 000000000000..1547625fea7e
index 000000000..a4386e8e9
--- /dev/null
+++ b/drivers/hwmon/pmbus/mp2891.c
@@ -0,0 +1,424 @@
@@ -0,0 +1,427 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Hardware monitoring driver for MPS Multi-phase Digital VR Controllers(MP2891)
Expand Down Expand Up @@ -456,7 +456,7 @@ index 000000000000..1547625fea7e
+ * bit 13 = 0, the vid_step is defined by bits 15:14:
+ * 00b - 6.25mV/LSB, 01b - 5mV/LSB, 10b - 2mV/LSB, 11b - 1mV
+ */
+ if ((ret & MP2891_DAC_2P5MV_MASK) >> MP2891_VID_STEP_POS) {
+ if (ret & MP2891_DAC_2P5MV_MASK) {
+ data->vid_step[page] = 250;
+ return mp2891_git_vid_volt_ref(client, data, page);
+ }
Expand All @@ -468,6 +468,9 @@ index 000000000000..1547625fea7e
+ case 2:
+ data->vid_step[page] = 200;
+ break;
+ case 3:
+ data->vid_step[page] = 100;
+ break;
+ default:
+ data->vid_step[page] = 250;
+ break;
Expand Down Expand Up @@ -626,5 +629,5 @@ index 000000000000..1547625fea7e
+MODULE_LICENSE("GPL");
+MODULE_IMPORT_NS(PMBUS);
--
2.20.1
2.44.0

Loading