From mboxrd@z Thu Jan 1 00:00:00 1970 From: Guruswamy Senthilvadivu Subject: [PATCH v1 16/16] OMAP3: hwmod DSS: Get DSS IRQ from platform device Date: Wed, 6 Oct 2010 16:44:59 +0530 Message-ID: <1286363699-9614-17-git-send-email-svadivu@ti.com> References: <1286363699-9614-1-git-send-email-svadivu@ti.com> <1286363699-9614-2-git-send-email-svadivu@ti.com> <1286363699-9614-3-git-send-email-svadivu@ti.com> <1286363699-9614-4-git-send-email-svadivu@ti.com> <1286363699-9614-5-git-send-email-svadivu@ti.com> <1286363699-9614-6-git-send-email-svadivu@ti.com> <1286363699-9614-7-git-send-email-svadivu@ti.com> <1286363699-9614-8-git-send-email-svadivu@ti.com> <1286363699-9614-9-git-send-email-svadivu@ti.com> <1286363699-9614-10-git-send-email-svadivu@ti.com> <1286363699-9614-11-git-send-email-svadivu@ti.com> <1286363699-9614-12-git-send-email-svadivu@ti.com> <1286363699-9614-13-git-send-email-svadivu@ti.com> <1286363699-9614-14-git-send-email-svadivu@ti.com> <1286363699-9614-15-git-send-email-svadivu@ti.com> <1286363699-9614-16-git-send-email-svadivu@ti.com> Return-path: Received: from devils.ext.ti.com ([198.47.26.153]:43973 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758647Ab0JFLP3 (ORCPT ); Wed, 6 Oct 2010 07:15:29 -0400 In-Reply-To: <1286363699-9614-16-git-send-email-svadivu@ti.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: khilman@deeprootsystems.com, tomi.valkeinen@nokia.com, paul@pwsan.com, hvaibhav@ti.com, linux-omap@vger.kernel.org Cc: Senthilvadivu Guruswamy From: Senthilvadivu Guruswamy DSS IRQ got from platform device. Signed-off-by: Senthilvadivu Guruswamy --- 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