GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-27 09:02:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Peng Ma 2020-08-18 14:36:09 +08:00 • committed by Alexandre Belloni
parent f471b05f76
commit 0d982de3e2
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/rtc/rtc-fsl-ftm-alarm.c
View file

@ -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[] = {
}; };
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);