Skip to contentSkip to conversation

rtc: fsl-ftm-alarm: enable acpi support

PATCH Applied Peng Ma 2 participants 3 messages Mar 18, 2020 – Mar 23, 2020 Real time clock (RTC)

lore
Share & tools
lore

Peng Ma

author
#0 lore raw

PATCH 1/1 rtc: fsl-ftm-alarm: enable acpi support

This patch enables ACPI support in Rtc Flex timer driver.

---
 drivers/rtc/rtc-fsl-ftm-alarm.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)
drivers/rtc/rtc-fsl-ftm-alarm.c +15 -5
index 9e6e994..c572044 100644
@@ -20,6 +20,7 @@
 #include <linux/fsl/ftm.h>
 #include <linux/rtc.h>
 #include <linux/time.h>
+#include <linux/acpi.h>
 
 #define FTM_SC_CLK(c)		((c) << FTM_SC_CLK_MASK_SHIFT)
 
@@ -265,10 +266,10 @@ static int ftm_rtc_probe(struct platform_device *pdev)
 		return PTR_ERR(rtc->base);
 	}
 
-	irq = irq_of_parse_and_map(np, 0);
-	if (irq <= 0) {
-		dev_err(&pdev->dev, "unable to get IRQ from DT, %d\n", irq);
-		return -EINVAL;
+	irq = platform_get_irq(pdev, 0);
+	if (irq < 0) {
+		dev_err(&pdev->dev, "can't get irq number\n");
+		return irq;
 	}
 
 	ret = devm_request_irq(&pdev->dev, irq, ftm_rtc_alarm_interrupt,
@@ -278,7 +279,9 @@ static int ftm_rtc_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	rtc->big_endian = of_property_read_bool(np, "big-endian");
+	rtc->big_endian =
+		device_property_read_bool(&pdev->dev, "big-endian");
+
 	rtc->alarm_freq = (u32)FIXED_FREQ_CLK / (u32)MAX_FREQ_DIV;
 	rtc->rtc_dev->ops = &ftm_rtc_ops;
 
@@ -305,11 +308,18 @@ static const struct of_device_id ftm_rtc_match[] = {
 	{ },
 };
 
+static const struct acpi_device_id ftm_imx_acpi_ids[] = {
+	{"NXP0011",},
+	{ }
+};
+MODULE_DEVICE_TABLE(acpi, ftm_imx_acpi_ids);
+
 static struct platform_driver ftm_rtc_driver = {
 	.probe		= ftm_rtc_probe,
 	.driver		= {
 		.name	= "ftm-alarm",
 		.of_match_table = ftm_rtc_match,
+		.acpi_match_table = ACPI_PTR(ftm_imx_acpi_ids),
 	},
 };
 
Signature · 1 line
2.9.5
maintainer Applied
#1 lore raw
Quoted 7 lines · Peng Ma

This patch enables ACPI support in Rtc Flex timer driver.

---
 drivers/rtc/rtc-fsl-ftm-alarm.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

Applied, thanks.

Signature · 3 lines
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
author
#2 lore raw

Hi Alexandre,

OK, Got it.
Thanks very much.

Best Regards,
Peng

Quoted 29 lines

-----Original Message-----
From: Alexandre Belloni <[email protected]>
Sent: 2020年3月23日 5:13
To: Peng Ma <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; Leo Li <[email protected]>; Ran Wang <[email protected]>; Biwen Li <[email protected]>
Subject: [EXT] Re: [PATCH] rtc: fsl-ftm-alarm: enable acpi support

Caution: EXT Email

Quoted 7 lines · Peng Ma

This patch enables ACPI support in Rtc Flex timer driver.

---
 drivers/rtc/rtc-fsl-ftm-alarm.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

Applied, thanks.

--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbootlin.c
om&amp;data=02%7C01%7Cpeng.ma%40nxp.com%7Cde862f8556e5440c9dcf0 8d7cea5c0b3%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C6372050 83604609156&amp;sdata=cN%2BVcgd1GZcqKt3Qx7T6v3%2Fq%2FwPXIZPyUDx9 vtoYdtI%3D&amp;reserved=0