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: linux-arm-kernel@lists.infradead.org, Senthilvadivu Guruswamy <svadivu@ti.com>, Sumit Semwal <sumit.semwal@ti.com> Subject: [PATCH v10 18/18] OMAP2,3: DSS2: Get DSS IRQ from platform device Date: Mon, 24 Jan 2011 11:52:05 +0530 [thread overview] Message-ID: <1295850125-21405-19-git-send-email-sumit.semwal@ti.com> (raw) In-Reply-To: <1295850125-21405-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. Reviewed-by: Paul Walmsley <paul@pwsan.com> Reviewed-by: Kevin Hilman <khilman@ti.com> Tested-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Senthilvadivu Guruswamy <svadivu@ti.com> Signed-off-by: Sumit Semwal <sumit.semwal@ti.com> --- drivers/video/omap2/dss/dss.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c index 4d7a816..f9390b4 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,11 +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, - cpu_is_omap24xx() - ? dss_irq_handler_omap2 - : dss_irq_handler_omap3, - 0, "OMAP DSS", NULL); + dss_irq = platform_get_irq(dss.pdev, 0); + if (dss_irq < 0) { + DSSERR("omap2 dss: platform_get_irq failed\n"); + r = -ENODEV; + goto fail1; + } + + 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"); @@ -641,7 +648,7 @@ static int dss_init(bool skip_init) return 0; fail2: - free_irq(INT_24XX_DSS_IRQ, NULL); + free_irq(dss_irq, NULL); fail1: iounmap(dss.base); fail0: -- 1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: sumit.semwal@ti.com (Sumit Semwal) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v10 18/18] OMAP2,3: DSS2: Get DSS IRQ from platform device Date: Mon, 24 Jan 2011 11:52:05 +0530 [thread overview] Message-ID: <1295850125-21405-19-git-send-email-sumit.semwal@ti.com> (raw) In-Reply-To: <1295850125-21405-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. Reviewed-by: Paul Walmsley <paul@pwsan.com> Reviewed-by: Kevin Hilman <khilman@ti.com> Tested-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Senthilvadivu Guruswamy <svadivu@ti.com> Signed-off-by: Sumit Semwal <sumit.semwal@ti.com> --- drivers/video/omap2/dss/dss.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c index 4d7a816..f9390b4 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,11 +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, - cpu_is_omap24xx() - ? dss_irq_handler_omap2 - : dss_irq_handler_omap3, - 0, "OMAP DSS", NULL); + dss_irq = platform_get_irq(dss.pdev, 0); + if (dss_irq < 0) { + DSSERR("omap2 dss: platform_get_irq failed\n"); + r = -ENODEV; + goto fail1; + } + + 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"); @@ -641,7 +648,7 @@ static int dss_init(bool skip_init) return 0; fail2: - free_irq(INT_24XX_DSS_IRQ, NULL); + free_irq(dss_irq, NULL); fail1: iounmap(dss.base); fail0: -- 1.7.1
next prev parent reply other threads:[~2011-01-24 6:23 UTC|newest] Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-01-24 6:21 [PATCH v10 00/18] OMAP2,3: hwmod DSS Adaptation Sumit Semwal 2011-01-24 6:21 ` Sumit Semwal 2011-01-24 6:21 ` [PATCH v10 01/18] OMAP2,3: DSS2: remove forced clk-disable from omap_dss_remove Sumit Semwal 2011-01-24 6:21 ` [PATCH v10 01/18] OMAP2, 3: " Sumit Semwal 2011-01-24 6:21 ` [PATCH v10 02/18] OMAP2420: hwmod data: add DSS DISPC RFBI VENC Sumit Semwal 2011-01-24 6:21 ` Sumit Semwal 2011-01-24 6:21 ` [PATCH v10 03/18] OMAP2430: " Sumit Semwal 2011-01-24 6:21 ` Sumit Semwal 2011-01-24 6:21 ` [PATCH v10 04/18] OMAP3: hwmod data: add DSS DISPC RFBI DSI VENC Sumit Semwal 2011-01-24 6:21 ` Sumit Semwal 2011-01-24 6:21 ` [PATCH v10 05/18] OMAP2,3 DSS2 Change driver name to omap_display Sumit Semwal 2011-01-24 6:21 ` Sumit Semwal 2011-02-24 9:27 ` Tomi Valkeinen 2011-02-24 9:27 ` Tomi Valkeinen 2011-02-28 6:53 ` Tomi Valkeinen 2011-02-28 6:53 ` Tomi Valkeinen 2011-02-28 7:09 ` archit taneja 2011-02-28 7:09 ` [PATCH v10 05/18] OMAP2, 3 " archit taneja 2011-02-28 7:19 ` [PATCH v10 05/18] OMAP2,3 " Tomi Valkeinen 2011-02-28 7:19 ` Tomi Valkeinen 2011-02-28 7:27 ` archit taneja 2011-02-28 7:27 ` [PATCH v10 05/18] OMAP2, 3 " archit taneja 2011-02-28 8:16 ` [PATCH v10 05/18] OMAP2,3 " Semwal, Sumit 2011-02-28 8:16 ` [PATCH v10 05/18] OMAP2, 3 " Semwal, Sumit 2011-02-28 8:29 ` [PATCH v10 05/18] OMAP2,3 " Tomi Valkeinen 2011-02-28 8:29 ` Tomi Valkeinen 2011-02-28 11:36 ` Cousson, Benoit 2011-02-28 11:36 ` [PATCH v10 05/18] OMAP2, 3 " Cousson, Benoit 2011-02-28 12:10 ` [PATCH v10 05/18] OMAP2,3 " Tomi Valkeinen 2011-02-28 12:10 ` Tomi Valkeinen 2011-02-28 12:13 ` Russell King - ARM Linux 2011-02-28 12:13 ` Russell King - ARM Linux 2011-02-28 13:38 ` Cousson, Benoit 2011-02-28 13:38 ` [PATCH v10 05/18] OMAP2, 3 " Cousson, Benoit 2011-02-28 14:06 ` [PATCH v10 05/18] OMAP2,3 " Russell King - ARM Linux 2011-02-28 14:06 ` Russell King - ARM Linux 2011-02-28 14:55 ` Cousson, Benoit 2011-02-28 14:55 ` [PATCH v10 05/18] OMAP2, 3 " Cousson, Benoit 2011-02-28 14:00 ` [PATCH v10 05/18] OMAP2,3 " Cousson, Benoit 2011-02-28 14:00 ` [PATCH v10 05/18] OMAP2, 3 " Cousson, Benoit 2011-02-28 14:57 ` [PATCH v10 05/18] OMAP2,3 " Tomi Valkeinen 2011-02-28 14:57 ` Tomi Valkeinen 2011-03-01 10:18 ` Cousson, Benoit 2011-03-01 10:18 ` [PATCH v10 05/18] OMAP2, 3 " Cousson, Benoit 2011-01-24 6:21 ` [PATCH v10 06/18] OMAP2,3 DSS2 Use Regulator init with driver name Sumit Semwal 2011-01-24 6:21 ` Sumit Semwal 2011-01-24 6:21 ` [PATCH v10 07/18] OMAP2,3: DSS2: Create new file display.c for central dss driver registration Sumit Semwal 2011-01-24 6:21 ` [PATCH v10 07/18] OMAP2, 3: " Sumit Semwal 2011-01-24 6:21 ` [PATCH v10 08/18] OMAP2,3: DSS2: board files: replace platform_device_register with omap_display_init() Sumit Semwal 2011-01-24 6:21 ` [PATCH v10 08/18] OMAP2, 3: " Sumit Semwal 2011-01-24 6:21 ` [PATCH v10 09/18] OMAP2,3: DSS2: Build omap_device for each DSS HWIP Sumit Semwal 2011-01-24 6:21 ` Sumit Semwal 2011-01-24 6:21 ` [PATCH v10 10/18] OMAP2,3: DSS2: DSS: create platform_driver, move init,exit to driver Sumit Semwal 2011-01-24 6:21 ` [PATCH v10 10/18] OMAP2, 3: DSS2: DSS: create platform_driver, move init, exit " Sumit Semwal 2011-01-24 6:21 ` [PATCH v10 11/18] OMAP2,3: DSS2: Move clocks from core driver to dss driver Sumit Semwal 2011-01-24 6:21 ` [PATCH v10 11/18] OMAP2, 3: " Sumit Semwal 2011-01-24 6:21 ` [PATCH v10 12/18] OMAP2,3: DSS2: RFBI: create platform_driver, move init,exit to driver Sumit Semwal 2011-01-24 6:21 ` [PATCH v10 12/18] OMAP2, 3: DSS2: RFBI: create platform_driver, move init, exit " Sumit Semwal 2011-01-24 6:22 ` [PATCH v10 13/18] OMAP2,3: DSS2: DISPC: create platform_driver, move init,exit " Sumit Semwal 2011-01-24 6:22 ` [PATCH v10 13/18] OMAP2, 3: DSS2: DISPC: create platform_driver, move init, exit " Sumit Semwal 2011-01-24 6:22 ` [PATCH v10 14/18] OMAP2,3: DSS2: VENC: create platform_driver, move init,exit " Sumit Semwal 2011-01-24 6:22 ` [PATCH v10 14/18] OMAP2, 3: DSS2: VENC: create platform_driver, move init, exit " Sumit Semwal 2011-01-24 6:22 ` [PATCH v10 15/18] OMAP2,3: DSS2: DSI: create platform_driver, move init,exit " Sumit Semwal 2011-01-24 6:22 ` [PATCH v10 15/18] OMAP2, 3: DSS2: DSI: create platform_driver, move init, exit " Sumit Semwal 2011-01-24 6:22 ` [PATCH v10 16/18] OMAP2,3: DSS2: replace printk with dev_dbg in init Sumit Semwal 2011-01-24 6:22 ` Sumit Semwal 2011-01-24 6:22 ` [PATCH v10 17/18] OMAP2,3: DSS2: Use platform device to get baseaddr Sumit Semwal 2011-01-24 6:22 ` Sumit Semwal 2011-01-24 6:22 ` Sumit Semwal [this message] 2011-01-24 6:22 ` [PATCH v10 18/18] OMAP2,3: DSS2: Get DSS IRQ from platform device Sumit Semwal 2011-01-27 12:49 ` Raghuveer Murthy 2011-01-27 12:49 ` [PATCH v10 18/18] OMAP2, 3: " Raghuveer Murthy 2011-01-27 12:59 ` Russell King - ARM Linux 2011-01-27 12:59 ` Russell King - ARM Linux 2011-01-27 13:04 ` Raghuveer Murthy 2011-01-27 13:04 ` Raghuveer Murthy 2011-01-27 15:23 ` Semwal, Sumit 2011-01-27 15:23 ` Semwal, Sumit 2011-02-14 14:09 ` [PATCH v10 18/18] OMAP2,3: " Tomi Valkeinen 2011-02-14 14:09 ` Tomi Valkeinen 2011-02-14 18:35 ` Semwal, Sumit 2011-02-14 18:35 ` [PATCH v10 18/18] OMAP2, 3: " Semwal, Sumit 2011-01-24 21:57 ` [PATCH v10 00/18] OMAP2,3: hwmod DSS Adaptation Kevin Hilman 2011-01-24 21:57 ` Kevin Hilman 2011-01-25 17:03 ` Tony Lindgren 2011-01-25 17:03 ` Tony Lindgren 2011-01-28 12:01 ` Tomi Valkeinen 2011-01-28 12:01 ` Tomi Valkeinen
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=1295850125-21405-19-git-send-email-sumit.semwal@ti.com \ --to=sumit.semwal@ti.com \ --cc=hvaibhav@ti.com \ --cc=khilman@ti.com \ --cc=linux-arm-kernel@lists.infradead.org \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.