From: Sumit Semwal <sumit.semwal@ti.com>
To: tomi.valkeinen@nokia.com, paul@pwsan.com, khilman@ti.com,
hvaibhav@ti.com, linux-omap@vger.kernel.org
Cc: Senthilvadivu Guruswamy <svadivu@ti.com>,
Sumit Semwal <sumit.semwal@ti.com>
Subject: [PATCH v8 18/18] OMAP2,3: DSS2: Get DSS IRQ from platform device
Date: Fri, 21 Jan 2011 20:20:41 +0530 [thread overview]
Message-ID: <1295621441-16678-19-git-send-email-sumit.semwal@ti.com> (raw)
In-Reply-To: <1295621441-16678-1-git-send-email-sumit.semwal@ti.com>
From: Senthilvadivu Guruswamy <svadivu@ti.com>
DSS IRQ number can be obtained from platform_get_irq(). This API in turn
picks the right IRQ number belonging to HW IP from the hwmod database.
So hardcoding of IRQ number could be removed.
Signed-off-by: Senthilvadivu Guruswamy <svadivu@ti.com>
Signed-off-by: Sumit Semwal <sumit.semwal@ti.com>
Reviewed-by: Paul Walmsley <paul@pwsan.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 4d7a816..22690e9 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -563,7 +563,7 @@ void dss_set_dac_pwrdn_bgz(bool enable)
static int dss_init(bool skip_init)
{
- int r;
+ int r, dss_irq;
u32 rev;
struct resource *dss_mem;
@@ -609,15 +609,18 @@ static 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.7.1
next prev parent reply other threads:[~2011-01-21 14:52 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-21 14:50 [PATCH v8 00/18] OMAP2,3: hwmod DSS Adaptation Sumit Semwal
2011-01-21 14:50 ` [PATCH v8 01/18] OMAP2,3: DSS2: remove forced clk-disable from omap_dss_remove Sumit Semwal
2011-01-21 14:50 ` [PATCH v8 02/18] OMAP2420: hwmod data: add DSS DISPC RFBI VENC Sumit Semwal
2011-01-21 14:50 ` [PATCH v8 03/18] OMAP2430: " Sumit Semwal
2011-01-21 14:50 ` [PATCH v8 04/18] OMAP3: hwmod data: add DSS DISPC RFBI DSI VENC Sumit Semwal
2011-01-21 14:50 ` [PATCH v8 05/18] OMAP2,3 DSS2 Change driver name to omap_display Sumit Semwal
2011-01-21 14:50 ` [PATCH v8 06/18] OMAP2,3 DSS2 Use Regulator init with driver name Sumit Semwal
2011-01-21 14:50 ` [PATCH v8 07/18] OMAP2,3: DSS2: Create new file display.c for central dss driver registration Sumit Semwal
2011-01-21 14:50 ` [PATCH v8 08/18] OMAP2,3: DSS2: board files: replace platform_device_register with omap_display_init() Sumit Semwal
2011-01-21 14:50 ` [PATCH v8 09/18] OMAP2,3: DSS2: Build omap_device for each DSS HWIP Sumit Semwal
2011-01-21 14:50 ` [PATCH v8 10/18] OMAP2,3: DSS2: DSS: create platform_driver, move init,exit to driver Sumit Semwal
2011-01-21 14:50 ` [PATCH v8 11/18] OMAP2,3: DSS2: Move clocks from core driver to dss driver Sumit Semwal
2011-01-21 14:50 ` [PATCH v8 12/18] OMAP2,3: DSS2: RFBI: create platform_driver, move init,exit to driver Sumit Semwal
2011-01-21 14:50 ` [PATCH v8 13/18] OMAP2,3: DSS2: DISPC: " Sumit Semwal
2011-01-21 14:50 ` [PATCH v8 14/18] OMAP2,3: DSS2: VENC: " Sumit Semwal
2011-01-21 14:50 ` [PATCH v8 15/18] OMAP2,3: DSS2: DSI: " Sumit Semwal
2011-01-21 14:50 ` [PATCH v8 16/18] OMAP2,3: DSS2: replace printk with dev_dbg in init Sumit Semwal
2011-01-21 14:50 ` [PATCH v8 17/18] OMAP2,3: DSS2: Use platform device to get baseaddr Sumit Semwal
2011-01-21 14:50 ` Sumit Semwal [this message]
2011-01-21 16:35 ` [PATCH v8 00/18] OMAP2,3: hwmod DSS Adaptation Kevin Hilman
2011-01-22 5:32 ` Semwal, Sumit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1295621441-16678-19-git-send-email-sumit.semwal@ti.com \
--to=sumit.semwal@ti.com \
--cc=hvaibhav@ti.com \
--cc=khilman@ti.com \
--cc=linux-omap@vger.kernel.org \
--cc=paul@pwsan.com \
--cc=svadivu@ti.com \
--cc=tomi.valkeinen@nokia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox