[PATCH 3/3] rtc: rtc-twl: use irq_of_parse_and_map helper

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Nicolae Rosia <Nicolae_Rosia@xxxxxxxxxx>
---
 drivers/rtc/Kconfig   | 2 +-
 drivers/rtc/rtc-twl.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 2189216..7ac7579 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -481,7 +481,7 @@ config RTC_DRV_TWL92330
 config RTC_DRV_TWL4030
 	tristate "TI TWL4030/TWL5030/TWL6030/TPS659x0"
 	depends on TWL4030_CORE
-	depends on OF
+	depends on OF && OF_IRQ
 	help
 	  If you say yes here you get support for the RTC on the
 	  TWL4030/TWL5030/TWL6030 family chips, used mostly with OMAP3 platforms.
diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c
index 3d76322..7994baf 100644
--- a/drivers/rtc/rtc-twl.c
+++ b/drivers/rtc/rtc-twl.c
@@ -30,6 +30,7 @@
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/of.h>
+#include <linux/of_irq.h>
 
 #include <linux/i2c/twl.h>
 
@@ -494,7 +495,7 @@ static int twl_rtc_probe(struct platform_device *pdev)
 	struct twl_rtc *twl_rtc;
 	struct device_node *np = pdev->dev.of_node;
 	int ret = -EINVAL;
-	int irq = platform_get_irq(pdev, 0);
+	int irq;
 	u8 rd_reg;
 
 	if (!np) {
@@ -502,6 +503,7 @@ static int twl_rtc_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
+	irq = irq_of_parse_and_map(np, 0);
 	if (irq <= 0)
 		return ret;
 
-- 
2.5.5

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux