From 00e08bd138b70d366e5facd651a43b34371c1d51 Mon Sep 17 00:00:00 2001 From: "Joshua V. Dillon" Date: Fri, 19 Sep 2025 09:59:47 -0700 Subject: [PATCH 1/3] Fixes for newer kernels. --- apml_alertl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apml_alertl.c b/apml_alertl.c index 1a44010..194aadd 100644 --- a/apml_alertl.c +++ b/apml_alertl.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -246,7 +247,7 @@ static int apml_alertl_probe(struct platform_device *pdev) return 0; } -static int alert_remove(struct platform_device *pdev) +static void alert_remove(struct platform_device *pdev) { #ifdef CONFIG_DEBUG_FS if (amd_apml) { @@ -254,7 +255,6 @@ static int alert_remove(struct platform_device *pdev) amd_apml = NULL; } #endif - return 0; } static const struct of_device_id apml_alertl_dt_ids[] = { From c574bb358287666481fc1a4eac95cb5c4dec9b1e Mon Sep 17 00:00:00 2001 From: "Joshua V. Dillon" Date: Fri, 19 Sep 2025 11:29:51 -0700 Subject: [PATCH 2/3] Fixes for newer kernels. --- apml_sbtsi.c | 2 +- sbrmi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apml_sbtsi.c b/apml_sbtsi.c index c0e4be6..4b6a0c7 100644 --- a/apml_sbtsi.c +++ b/apml_sbtsi.c @@ -301,7 +301,7 @@ static int sbtsi_i3c_probe(struct i3c_device *i3cdev) struct regmap *regmap; const char *name; - regmap = devm_regmap_init_i3c(i3cdev, &sbtsi_i3c_regmap_config); + regmap = devm_regmap_init_i2c(i3cdev, &sbtsi_i3c_regmap_config); if (IS_ERR(regmap)) { dev_err(&i3cdev->dev, "Failed to register i3c regmap %d\n", (int)PTR_ERR(regmap)); diff --git a/sbrmi.c b/sbrmi.c index 1b5163a..f771b88 100644 --- a/sbrmi.c +++ b/sbrmi.c @@ -511,7 +511,7 @@ static int init_rmi_regmap(struct apml_sbrmi_device *rmi_dev, u32 size, u32 rev) struct regmap *regmap; if (rmi_dev->i3cdev) { - regmap = devm_regmap_init_i3c(rmi_dev->i3cdev, + regmap = devm_regmap_init_i2c(rmi_dev->i3cdev, &sbrmi_regmap_config); if (IS_ERR(regmap)) { dev_err(&rmi_dev->i3cdev->dev, From 5cf7f4cf7fb64793aa622196e1b5d492a883c439 Mon Sep 17 00:00:00 2001 From: "Joshua V. Dillon" Date: Fri, 19 Sep 2025 11:32:16 -0700 Subject: [PATCH 3/3] Fixes for newer kernels. --- apml_sbtsi.c | 2 +- sbrmi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apml_sbtsi.c b/apml_sbtsi.c index 4b6a0c7..c0e4be6 100644 --- a/apml_sbtsi.c +++ b/apml_sbtsi.c @@ -301,7 +301,7 @@ static int sbtsi_i3c_probe(struct i3c_device *i3cdev) struct regmap *regmap; const char *name; - regmap = devm_regmap_init_i2c(i3cdev, &sbtsi_i3c_regmap_config); + regmap = devm_regmap_init_i3c(i3cdev, &sbtsi_i3c_regmap_config); if (IS_ERR(regmap)) { dev_err(&i3cdev->dev, "Failed to register i3c regmap %d\n", (int)PTR_ERR(regmap)); diff --git a/sbrmi.c b/sbrmi.c index f771b88..1b5163a 100644 --- a/sbrmi.c +++ b/sbrmi.c @@ -511,7 +511,7 @@ static int init_rmi_regmap(struct apml_sbrmi_device *rmi_dev, u32 size, u32 rev) struct regmap *regmap; if (rmi_dev->i3cdev) { - regmap = devm_regmap_init_i2c(rmi_dev->i3cdev, + regmap = devm_regmap_init_i3c(rmi_dev->i3cdev, &sbrmi_regmap_config); if (IS_ERR(regmap)) { dev_err(&rmi_dev->i3cdev->dev,