From mboxrd@z Thu Jan  1 00:00:00 1970
From: x0075817@ti.com (Raghuveer Murthy)
Date: Thu, 27 Jan 2011 18:19:21 +0530
Subject: [PATCH v10 18/18] OMAP2, 3: DSS2: Get DSS IRQ from platform device
In-Reply-To: <1295850125-21405-19-git-send-email-sumit.semwal@ti.com>
References: <1295850125-21405-1-git-send-email-sumit.semwal@ti.com>
	<1295850125-21405-19-git-send-email-sumit.semwal@ti.com>
Message-ID: <4D4169D1.20001@ti.com>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

Hi Sumit,

On Monday 24 January 2011 11:52 AM, Sumit Semwal wrote:
> 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,

it should be

		cpu_is_omap24xx()
		? dss_irq_handler_omap3
		: dss_irq_handler_omap2,

I am seeing a crash on Panda, which gets rectified with this
change. The root cause is access to DSS_IRQSTATUS register in the
dss_irq_handler_omap3 handler, which is not valid for OMAP4.

Regards,
Raghuveer

> +		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: