Commit 0d982de3 authored by Peng Ma's avatar Peng Ma Committed by Alexandre Belloni

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

Original device id would conflict with crypto driver, change it.
Signed-off-by: default avatarPeng Ma <peng.ma@nxp.com>
Signed-off-by: default avatarRan Wang <ran.wang_1@nxp.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20200818063609.39859-1-ran.wang_1@nxp.com
parent f471b05f
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Freescale FlexTimer Module (FTM) alarm device driver. * Freescale FlexTimer Module (FTM) alarm device driver.
* *
* Copyright 2014 Freescale Semiconductor, Inc. * 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[] = { ...@@ -312,7 +312,7 @@ static const struct of_device_id ftm_rtc_match[] = {
}; };
static const struct acpi_device_id ftm_imx_acpi_ids[] = { static const struct acpi_device_id ftm_imx_acpi_ids[] = {
{"NXP0011",}, {"NXP0014",},
{ } { }
}; };
MODULE_DEVICE_TABLE(acpi, ftm_imx_acpi_ids); MODULE_DEVICE_TABLE(acpi, ftm_imx_acpi_ids);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment