From patchwork Thu Dec  2 20:52:19 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Tony Lindgren <tony@atomide.com>
X-Patchwork-Id: 375831
X-Patchwork-Delegate: tony@atomide.com
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB2KrEQA001019
	for <patchwork-omap@patchwork.kernel.org>;
	Thu, 2 Dec 2010 20:53:15 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1758101Ab0LBUwa (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Thu, 2 Dec 2010 15:52:30 -0500
Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:54508 "EHLO
	mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1758030Ab0LBUw2 (ORCPT
	<rfc822; linux-omap@vger.kernel.org>); Thu, 2 Dec 2010 15:52:28 -0500
Received: from c-24-130-172-179.hsd1.ca.comcast.net ([24.130.172.179]
	helo=localhost.localdomain)
	by mho-02-ewr.mailhop.org with esmtpa (Exim 4.68)
	(envelope-from <tony@atomide.com>)
	id 1POG8i-000NR2-4G; Thu, 02 Dec 2010 20:52:28 +0000
Received: from Mutt by mutt-smtp-wrapper.pl 1.2
	(www.zdo.com/articles/mutt-smtp-wrapper.shtml)
X-Mail-Handler: MailHop Outbound by DynDNS
X-Originating-IP: 24.130.172.179
X-Report-Abuse-To: abuse@dyndns.com (see
	http://www.dyndns.com/services/mailhop/outbound_abuse.html
	for abuse reporting information)
X-MHO-User: U2FsdGVkX18Th5NFVuFvwuyVyzFNns+/
Date: Thu, 2 Dec 2010 12:52:19 -0800
From: Tony Lindgren <tony@atomide.com>
To: "G, Manjunath Kondaiah" <manjugk@ti.com>
Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	Kevin Hilman <khilman@deeprootsystems.com>,
	Santosh Shilimkar <santosh.shilimkar@ti.com>,
	Benoit Cousson <b-cousson@ti.com>
Subject: Re: [PATCH v5 09/14] OMAP: DMA: Convert DMA library into platform
	driver
Message-ID: <20101202205219.GV17222@atomide.com>
References: <1290603110-14119-1-git-send-email-manjugk@ti.com>
	<1290603110-14119-10-git-send-email-manjugk@ti.com>
	<20101202184419.GR17222@atomide.com>
	<20101202184617.GS17222@atomide.com>
	<20101202184925.GT17222@atomide.com>
	<20101202200454.GA27696@manju-desktop>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <20101202200454.GA27696@manju-desktop>
User-Agent: Mutt/1.5.20 (2009-06-14)
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Thu, 02 Dec 2010 20:53:15 +0000 (UTC)


--- a/arch/arm/mach-omap1/dma.c
+++ b/arch/arm/mach-omap1/dma.c
@@ -118,6 +118,7 @@ static struct resource res[] __initdata = {
 		.start  = INT_DMA_CH5,
 		.flags  = IORESOURCE_IRQ,
 	},
+	/* Handled in lcd_dma.c */
 	[7] = {
 		.name   = "6",
 		.start  = INT_DMA_LCD,
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -2025,6 +2025,11 @@ static int __devinit omap_system_dma_probe(struct platform_device *pdev)
 				ret = dma_irq;
 				goto exit_dma_chan;
 			}
+
+			/* INT_DMA_LCD is handled in lcd_dma.c */
+			if (dma_irq == INT_DMA_LCD)
+				continue;
+
 			ret = request_irq(dma_irq,
 					omap1_dma_irq_handler, 0, "DMA",
 					(void *) (ch + 1));