* [PATCH] rtc: fsl-ftm-alarm: update acpi device id
@ 2020-08-18 6:36 Ran Wang
2020-08-20 22:20 ` Alexandre Belloni
0 siblings, 1 reply; 2+ messages in thread
From: Ran Wang @ 2020-08-18 6:36 UTC (permalink / raw)
To: Alessandro Zummo, Alexandre Belloni
Cc: linux-rtc, linux-kernel, Peng Ma, Ran Wang
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(-)
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);
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] rtc: fsl-ftm-alarm: update acpi device id
2020-08-18 6:36 [PATCH] rtc: fsl-ftm-alarm: update acpi device id Ran Wang
@ 2020-08-20 22:20 ` Alexandre Belloni
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Belloni @ 2020-08-20 22:20 UTC (permalink / raw)
To: Alessandro Zummo, Ran Wang
Cc: Alexandre Belloni, linux-rtc, Peng Ma, linux-kernel
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,
--
Alexandre Belloni <alexandre.belloni@bootlin.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-20 22:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-18 6:36 [PATCH] rtc: fsl-ftm-alarm: update acpi device id Ran Wang
2020-08-20 22:20 ` Alexandre Belloni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.