Merge tag 'Smack-for-5.11-io_uring-fix' of git://github.com/cschaufler/smack-next

[linux-2.6-microblaze.git] / drivers / rtc / rtc-fsl-ftm-alarm.c

diff --git a/drivers/rtc/rtc-fsl-ftm-alarm.c b/drivers/rtc/rtc-fsl-ftm-alarm.c
index 68f0a18..57cc09d 100644 (file)
--- a/drivers/rtc/rtc-fsl-ftm-alarm.c
+++ b/drivers/rtc/rtc-fsl-ftm-alarm.c
@@ -3,7 +3,7 @@
  * Freescale FlexTimer Module (FTM) alarm device driver.
  *
  * Copyright 2014 Freescale Semiconductor, Inc.
- * Copyright 2019 NXP
+ * Copyright 2019-2020 NXP
  *
  */
 
@@ -290,7 +290,7 @@ static int ftm_rtc_probe(struct platform_device *pdev)
        if (ret)
                dev_err(&pdev->dev, "failed to enable irq wake\n");
 
-       ret = rtc_register_device(rtc->rtc_dev);
+       ret = devm_rtc_register_device(rtc->rtc_dev);
        if (ret) {
                dev_err(&pdev->dev, "can't register rtc device\n");
                return ret;
@@ -312,7 +312,7 @@ static const struct of_device_id ftm_rtc_match[] = {
 };
 
 static const struct acpi_device_id ftm_imx_acpi_ids[] = {
-       {"NXP0011",},
+       {"NXP0014",},
        { }
 };
 MODULE_DEVICE_TABLE(acpi, ftm_imx_acpi_ids);