From: Peng Ma <peng...@nxp.com>

This patch enables ACPI support in RCPM driver.

Signed-off-by: Peng Ma <peng...@nxp.com>
Signed-off-by: Ran Wang <ran.wan...@nxp.com>
---
Change in v2:
 - Update acpi_device_id to fix conflict with other driver

 drivers/soc/fsl/rcpm.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/soc/fsl/rcpm.c b/drivers/soc/fsl/rcpm.c
index a093dbe..230c232 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.wan...@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);
+
        if (ret)
                return ret;
 
@@ -139,10 +141,17 @@ static const struct of_device_id rcpm_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, rcpm_of_match);
 
+static const struct acpi_device_id rcpm_imx_acpi_ids[] = {
+       {"NXP0015",},
+       { }
+};
+MODULE_DEVICE_TABLE(acpi, rcpm_imx_acpi_ids);
+
 static struct platform_driver rcpm_driver = {
        .driver = {
                .name = "rcpm",
                .of_match_table = rcpm_of_match,
+               .acpi_match_table = ACPI_PTR(rcpm_imx_acpi_ids),
                .pm     = &rcpm_pm_ops,
        },
        .probe = rcpm_probe,
-- 
2.7.4

Reply via email to