diff options
| author | Peng Ma <peng.ma@nxp.com> | 2020-08-18 08:36:09 +0200 |
|---|---|---|
| committer | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2020-08-21 00:20:38 +0200 |
| commit | 0d982de3e27e8091dfa62368cd3eefbc7c17c8a2 (patch) | |
| tree | 50e4cf3527d28d0d1c340dba5f24ec79ae5b3c8b /drivers/rtc | |
| parent | rtc: ds1307: Clear OSF flag on DS1388 when setting time (diff) | |
| download | linux-0d982de3e27e8091dfa62368cd3eefbc7c17c8a2.tar.xz linux-0d982de3e27e8091dfa62368cd3eefbc7c17c8a2.zip | |
rtc: fsl-ftm-alarm: update acpi device id
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
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-fsl-ftm-alarm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-fsl-ftm-alarm.c b/drivers/rtc/rtc-fsl-ftm-alarm.c index 68f0a1801a2e..48d3b38ea348 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); |