hw-mgmt: kernel 6.12: Fix patches apply for 6.12.41

Fix patches apply for 6.12.41

Bug: 4667679

Signed-off-by: Oleksandr Shamray <[email protected]>

Author: sholeksandr

recipes-kernel/linux/linux-6.12/8013-hwmon-pmbus-mp2975-Clear-interrupts-at-probe.patch

@@ -14,18 +14,18 @@ Signed-off-by: Ciju Rajan K <[email protected]>
  1 file changed, 28 insertions(+)
 
 diff --git a/drivers/hwmon/pmbus/mp2975.c b/drivers/hwmon/pmbus/mp2975.c
-index 51986adfb..47f092259 100644
+index 280bb12f762c..fbaee50c7129 100644
 --- a/drivers/hwmon/pmbus/mp2975.c
 +++ b/drivers/hwmon/pmbus/mp2975.c
-@@ -33,6 +33,7 @@
- #define MP2975_MFR_READ_VREF_R2		0xa3
- #define MP2975_MFR_OVP_TH_SET		0xe5
+@@ -38,6 +38,7 @@
  #define MP2975_MFR_UVP_SET		0xe6
+ 
+ #define MP2973_MFR_RESO_SET		0xc7
 +#define MP2975_CLEAR_CAT_FAULTS 	0xfd
 
  #define MP2975_VOUT_FORMAT		BIT(15)
  #define MP2975_VID_STEP_SEL_R1		BIT(4)
-@@ -659,6 +660,28 @@ mp2975_vout_per_rail_config_get(struct i2c_client *client,
+@@ -939,6 +940,28 @@ mp2975_vout_per_rail_config_get(struct i2c_client *client,
  	return 0;
  }
 
@@ -51,10 +51,10 @@ index 51986adfb..47f092259 100644
 +	return ret;
 +}
 +
- static struct pmbus_driver_info mp2975_info = {
+ static const struct pmbus_driver_info mp2975_info = {
  	.pages = 1,
  	.format[PSC_VOLTAGE_IN] = linear,
-@@ -736,6 +759,11 @@ static int mp2975_probe(struct i2c_client *client)
+@@ -1068,6 +1091,11 @@ static int mp2975_probe(struct i2c_client *client)
  	if (ret)
  		return ret;
 
@@ -68,4 +68,3 @@ index 51986adfb..47f092259 100644
 
 -- 
 2.47.2
-

recipes-kernel/linux/linux-6.12/8014-platform-mellanox-mlxreg-dpu-Debug-trace-for-dpu-pro.patch

@@ -9,10 +9,10 @@ Signed-off-by: Ciju Rajan K <[email protected]>
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/platform/mellanox/mlxreg-dpu.c b/drivers/platform/mellanox/mlxreg-dpu.c
-index c79531481..1074c4853 100644
+index 314385cc1495..3b07c66c87dc 100644
 --- a/drivers/platform/mellanox/mlxreg-dpu.c
 +++ b/drivers/platform/mellanox/mlxreg-dpu.c
-@@ -537,9 +537,13 @@ static int mlxreg_dpu_probe(struct platform_device *pdev)
+@@ -530,9 +530,13 @@ static int mlxreg_dpu_probe(struct platform_device *pdev)
  	if (!data || !data->hpdev.brdinfo)
  		return -EINVAL;
 
@@ -26,7 +26,7 @@ index c79531481..1074c4853 100644
 +	}
 
  	mlxreg_dpu = devm_kzalloc(&pdev->dev, sizeof(*mlxreg_dpu), GFP_KERNEL);
- 	if (!mlxreg_dpu)
+ 	if (!mlxreg_dpu) {
 -- 
 2.47.2