[PATCH v1 16/16] OMAP3: hwmod DSS: Get DSS IRQ from platform device

[Guruswamy Senthilvadivu]

From: Senthilvadivu Guruswamy <svad...@ti.com>

DSS IRQ got from platform device.

Signed-off-by: Senthilvadivu Guruswamy <svad...@ti.com>
---
 drivers/video/omap2/dss/dss.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index 9a95ab8..f56d1b8 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -966,7 +966,7 @@ void dss_set_dac_pwrdn_bgz(bool enable)
 
 int dss_init(bool skip_init)
 {
-       int r;
+       int r, dss_irq;
        u32 rev;
        struct resource *dss_mem;
 
@@ -1012,15 +1012,18 @@ int dss_init(bool skip_init)
        REG_FLD_MOD(DSS_CONTROL, 0, 2, 2);      /* venc clock mode = normal */
 #endif
 
-       r = request_irq(INT_24XX_DSS_IRQ,
+       dss_irq = platform_get_irq(dss.pdev, 0);
+       if (dss_irq != -ENXIO) {
+               r = request_irq(dss_irq,
                        cpu_is_omap24xx()
                        ? dss_irq_handler_omap2
                        : dss_irq_handler_omap3,
                        0, "OMAP DSS", NULL);
 
-       if (r < 0) {
-               DSSERR("omap2 dss: request_irq failed\n");
-               goto fail1;
+               if (r < 0) {
+                       DSSERR("omap2 dss: request_irq failed\n");
+                       goto fail1;
+               }
        }
 
        if (cpu_is_omap34xx()) {
-- 
1.6.3.3

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