Skip to content

Commit defad57

Browse files
committed
hw-mgmt: kernel 6.12: Fix patches for new MPS devices
Fix kernel 6.12 patches for MPS devices: MP2845 MP5926 Signed-off-by: Oleksandr Shamray <oleksandrs@nvidia.com>
1 parent 95bc996 commit defad57

File tree

2 files changed

+20
-22
lines changed

2 files changed

+20
-22
lines changed

recipes-kernel/linux/linux-6.12/0056-hwmon-pmbus-mp2845-Add-support-for-MP2845-device.patch

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
From d44afa51c9fad533b29de8a06f43fa94b44959e7 Mon Sep 17 00:00:00 2001
1+
From 5ba8fda8e39bd295fe065d2c84e60b59e94c2760 Mon Sep 17 00:00:00 2001
22
From: Vadim Pasternak <vadimp@nvidia.com>
33
Date: Wed, 3 Dec 2025 17:07:17 +0200
4-
Subject: [PATCH hwmon-next 1/2] hwmon: (pmbus/mp2845): Add support for MP2845
5-
device
4+
Subject: [PATCH 1/2] hwmon: (pmbus/mp2845): Add support for MP2845 device
65

76
Add support for MPS device MP2845 - Digital Multi-Phase Power
87
Controller.
@@ -15,12 +14,12 @@ Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
1514
---
1615
drivers/hwmon/pmbus/Kconfig | 9 +
1716
drivers/hwmon/pmbus/Makefile | 1 +
18-
drivers/hwmon/pmbus/mp2845.c | 493 +++++++++++++++++++++++++++++++++++
17+
drivers/hwmon/pmbus/mp2845.c | 493 +++++++++++++++++++++++++++++++++++++++++++
1918
3 files changed, 503 insertions(+)
2019
create mode 100644 drivers/hwmon/pmbus/mp2845.c
2120

2221
diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig
23-
index a4f02cad92fd..c26b19e3d0e6 100644
22+
index 369e409..946613e 100644
2423
--- a/drivers/hwmon/pmbus/Kconfig
2524
+++ b/drivers/hwmon/pmbus/Kconfig
2625
@@ -319,6 +319,15 @@ config SENSORS_MAX8688
@@ -36,24 +35,24 @@ index a4f02cad92fd..c26b19e3d0e6 100644
3635
+ This driver can also be built as a module. If so, the module will
3736
+ be called mp2845.
3837
+
39-
config SENSORS_MP2856
40-
tristate "MPS MP2856"
38+
config SENSORS_MP2855
39+
tristate "MPS MP2855"
4140
help
4241
diff --git a/drivers/hwmon/pmbus/Makefile b/drivers/hwmon/pmbus/Makefile
43-
index d00bcc758b97..fec1bf832535 100644
42+
index a95fc50..c716461 100644
4443
--- a/drivers/hwmon/pmbus/Makefile
4544
+++ b/drivers/hwmon/pmbus/Makefile
4645
@@ -34,6 +34,7 @@ obj-$(CONFIG_SENSORS_MAX20751) += max20751.o
4746
obj-$(CONFIG_SENSORS_MAX31785) += max31785.o
4847
obj-$(CONFIG_SENSORS_MAX34440) += max34440.o
4948
obj-$(CONFIG_SENSORS_MAX8688) += max8688.o
5049
+obj-$(CONFIG_SENSORS_MP2845) += mp2845.o
50+
obj-$(CONFIG_SENSORS_MP2855) += mp2855.o
5151
obj-$(CONFIG_SENSORS_MP2856) += mp2856.o
52-
obj-$(CONFIG_SENSORS_MP2888) += mp2888.o
53-
obj-$(CONFIG_SENSORS_MP2891) += mp2891.o
52+
obj-$(CONFIG_SENSORS_MP2869) += mp2869.o
5453
diff --git a/drivers/hwmon/pmbus/mp2845.c b/drivers/hwmon/pmbus/mp2845.c
5554
new file mode 100644
56-
index 000000000000..96d3dc59e84a
55+
index 00000000..96d3dc5
5756
--- /dev/null
5857
+++ b/drivers/hwmon/pmbus/mp2845.c
5958
@@ -0,0 +1,493 @@
@@ -551,5 +550,5 @@ index 000000000000..96d3dc59e84a
551550
+MODULE_DESCRIPTION("MP2845 driver");
552551
+MODULE_LICENSE("GPL");
553552
--
554-
2.34.1
553+
2.8.4
555554

recipes-kernel/linux/linux-6.12/0057-hwmon-pmbus-mp5926-Add-support-for-MP5926-device.patch

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
From 228bd9ebb65446d2947195655a3657cbba33ce99 Mon Sep 17 00:00:00 2001
1+
From e5d678169c052940009201338af7832fdc672ca2 Mon Sep 17 00:00:00 2001
22
From: Vadim Pasternak <vadimp@nvidia.com>
33
Date: Wed, 3 Dec 2025 19:18:38 +0200
4-
Subject: [PATCH hwmon-next 2/2] hwmon: (pmbus/mp5926): Add support for device
5-
MP5926
4+
Subject: [PATCH 2/2] hwmon: (pmbus/mp5926): Add support for device MP5926
65

76
Add support for MPS device MP5926.
87

@@ -14,15 +13,15 @@ Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
1413
---
1514
drivers/hwmon/pmbus/Kconfig | 9 ++
1615
drivers/hwmon/pmbus/Makefile | 1 +
17-
drivers/hwmon/pmbus/mp5926.c | 192 +++++++++++++++++++++++++++++++++++
16+
drivers/hwmon/pmbus/mp5926.c | 192 +++++++++++++++++++++++++++++++++++++++++++
1817
3 files changed, 202 insertions(+)
1918
create mode 100644 drivers/hwmon/pmbus/mp5926.c
2019

2120
diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig
22-
index c26b19e3d0e6..66c83ed64fb1 100644
21+
index 946613e..08c9e7b 100644
2322
--- a/drivers/hwmon/pmbus/Kconfig
2423
+++ b/drivers/hwmon/pmbus/Kconfig
25-
@@ -398,6 +398,15 @@ config SENSORS_MP5920
24+
@@ -426,6 +426,15 @@ config SENSORS_MP5920
2625
This driver can also be built as a module. If so, the module will
2726
be called mp5920.
2827

@@ -39,10 +38,10 @@ index c26b19e3d0e6..66c83ed64fb1 100644
3938
tristate "MPS MP5990"
4039
help
4140
diff --git a/drivers/hwmon/pmbus/Makefile b/drivers/hwmon/pmbus/Makefile
42-
index fec1bf832535..5b1d67f26242 100644
41+
index c716461..1a641d9 100644
4342
--- a/drivers/hwmon/pmbus/Makefile
4443
+++ b/drivers/hwmon/pmbus/Makefile
45-
@@ -42,6 +42,7 @@ obj-$(CONFIG_SENSORS_MP2975) += mp2975.o
44+
@@ -45,6 +45,7 @@ obj-$(CONFIG_SENSORS_MP2975) += mp2975.o
4645
obj-$(CONFIG_SENSORS_MP2993) += mp2993.o
4746
obj-$(CONFIG_SENSORS_MP5023) += mp5023.o
4847
obj-$(CONFIG_SENSORS_MP5920) += mp5920.o
@@ -52,7 +51,7 @@ index fec1bf832535..5b1d67f26242 100644
5251
obj-$(CONFIG_SENSORS_MPQ7932) += mpq7932.o
5352
diff --git a/drivers/hwmon/pmbus/mp5926.c b/drivers/hwmon/pmbus/mp5926.c
5453
new file mode 100644
55-
index 000000000000..626d945be5b6
54+
index 00000000..626d945
5655
--- /dev/null
5756
+++ b/drivers/hwmon/pmbus/mp5926.c
5857
@@ -0,0 +1,192 @@
@@ -249,5 +248,5 @@ index 000000000000..626d945be5b6
249248
+MODULE_LICENSE("GPL");
250249
+MODULE_IMPORT_NS(PMBUS);
251250
--
252-
2.34.1
251+
2.8.4
253252

0 commit comments

Comments
 (0)