diff mbox series

rtc: fsl-ftm-alarm: update acpi device id

Message ID 20200818063609.39859-1-ran.wang_1@nxp.com
State Accepted
Headers show
Series rtc: fsl-ftm-alarm: update acpi device id | expand

Commit Message

Ran Wang Aug. 18, 2020, 6:36 a.m. UTC 
From: Peng Ma <peng.ma@nxp.com>

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>
---
 drivers/rtc/rtc-fsl-ftm-alarm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Alexandre Belloni Aug. 20, 2020, 10:20 p.m. UTC | #1 
On Tue, 18 Aug 2020 14:36:09 +0800, Ran Wang wrote:
> Original device id would conflict with crypto driver, change it.

Applied, thanks!

[1/1] rtc: fsl-ftm-alarm: update acpi device id
      commit: 0d982de3e27e8091dfa62368cd3eefbc7c17c8a2

Best regards,
diff mbox series

Patch

diff --git a/drivers/rtc/rtc-fsl-ftm-alarm.c b/drivers/rtc/rtc-fsl-ftm-alarm.c
index 68f0a18..48d3b38 100644
--- 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
  *
  */
 
@@ -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);