Thread (3 messages) flat view 3 messages, 2 authors, 2020-08-19

Re: [PATCH v3] soc: fsl: enable acpi support

From: Christophe Leroy <hidden>
Date: 2020-08-19 06:48:35
Also in: linux-arm-kernel, lkml


Le 19/08/2020 à 06:00, Ran Wang a écrit :
From: Peng Ma <redacted>

This patch enables ACPI support in RCPM driver.
Can you change the subject to "soc: fsl: enable acpi support in RCPM 
driver" ?
quoted hunk ↗ jump to hunk
Signed-off-by: Peng Ma <redacted>
Signed-off-by: Ran Wang <redacted>
---
Change in v3:
  - Add #ifdef CONFIG_ACPI for acpi_device_id
  - Rename rcpm_acpi_imx_ids to rcpm_acpi_ids

Change in v2:
  - Update acpi_device_id to fix conflict with other driver

  drivers/soc/fsl/rcpm.c | 13 ++++++++++++-
  1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/soc/fsl/rcpm.c b/drivers/soc/fsl/rcpm.c
index a093dbe..55d1d73 100644
--- a/drivers/soc/fsl/rcpm.c
+++ b/drivers/soc/fsl/rcpm.c
@@ -2,7 +2,7 @@
  //
  // rcpm.c - Freescale QorIQ RCPM driver
  //
-// Copyright 2019 NXP
+// Copyright 2019-2020 NXP
  //
  // Author: Ran Wang <ran.wang_1@nxp.com>
  
@@ -13,6 +13,7 @@
  #include <linux/slab.h>
  #include <linux/suspend.h>
  #include <linux/kernel.h>
+#include <linux/acpi.h>
  
  #define RCPM_WAKEUP_CELL_MAX_SIZE	7
  
@@ -125,6 +126,7 @@ static int rcpm_probe(struct platform_device *pdev)
  
  	ret = device_property_read_u32(&pdev->dev,
  			"#fsl,rcpm-wakeup-cells", &rcpm->wakeup_cells);
+
This blank line addition is unrelated to the patch and shouldn't be there.

Christophe
quoted hunk ↗ jump to hunk
  	if (ret)
  		return ret;
  
@@ -139,10 +141,19 @@ static const struct of_device_id rcpm_of_match[] = {
  };
  MODULE_DEVICE_TABLE(of, rcpm_of_match);
  
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id rcpm_acpi_ids[] = {
+	{"NXP0015",},
+	{ }
+};
+MODULE_DEVICE_TABLE(acpi, rcpm_acpi_ids);
+#endif
+
  static struct platform_driver rcpm_driver = {
  	.driver = {
  		.name = "rcpm",
  		.of_match_table = rcpm_of_match,
+		.acpi_match_table = ACPI_PTR(rcpm_acpi_ids),
  		.pm	= &rcpm_pm_ops,
  	},
  	.probe = rcpm_probe,
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help