rtc: fsl-ftm-alarm: update acpi device id
authorPeng Ma <peng.ma@nxp.com>
Tue, 18 Aug 2020 06:36:09 +0000 (14:36 +0800)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Thu, 20 Aug 2020 22:20:38 +0000 (00:20 +0200)
Original device id would conflict with crypto driver, change it.

Signed-off-by: Peng Ma <peng.ma@nxp.com>
Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20200818063609.39859-1-ran.wang_1@nxp.com
drivers/rtc/rtc-fsl-ftm-alarm.c

index 68f0a18..48d3b38 100644 (file)
@@ -3,7 +3,7 @@
  * Freescale FlexTimer Module (FTM) alarm device driver.
  *
  * Copyright 2014 Freescale Semiconductor, Inc.
- * Copyright 2019 NXP
+ * Copyright 2019-2020 NXP
  *
  */
 
@@ -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);