Skip to contentSkip to conversation

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

PATCH Applied Ran Wang 2 participants 2 messages Aug 18, 2020 – Aug 20, 2020 Real time clock (RTC)

lore
Share & tools
lore

Ran Wang

author
#0 lore raw

PATCH 1/1 rtc: fsl-ftm-alarm: update acpi device id

From: Peng Ma <[email protected]>

Original device id would conflict with crypto driver, change it.

---
 drivers/rtc/rtc-fsl-ftm-alarm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/rtc/rtc-fsl-ftm-alarm.c +2 -2
index 68f0a18..48d3b38 100644
@@ -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);
Signature · 1 line
2.7.4
maintainer Applied
#1 lore raw
Quoted 1 line · Ran Wang

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,

Signature · 1 line
Alexandre Belloni <[email protected]>