From patchwork Tue May 17 10:33:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 791182 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 p4HAXlTl011416 for ; Tue, 17 May 2011 10:33:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752999Ab1EQKdq (ORCPT ); Tue, 17 May 2011 06:33:46 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:35884 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752232Ab1EQKdq (ORCPT ); Tue, 17 May 2011 06:33:46 -0400 Received: from dlep33.itg.ti.com ([157.170.170.112]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id p4HAXifq014256 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 17 May 2011 05:33:44 -0500 Received: from dlep26.itg.ti.com (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id p4HAXios011349; Tue, 17 May 2011 05:33:44 -0500 (CDT) Received: from dlee73.ent.ti.com (localhost [127.0.0.1]) by dlep26.itg.ti.com (8.13.8/8.13.8) with ESMTP id p4HAXioW003707; Tue, 17 May 2011 05:33:44 -0500 (CDT) Received: from dlelxv22.itg.ti.com (172.17.1.197) by DLEE73.ent.ti.com (157.170.170.88) with Microsoft SMTP Server id 8.3.106.1; Tue, 17 May 2011 05:33:43 -0500 Received: from barack.norway.design.ti.com (h88-10.vpn.ti.com [172.24.88.10]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id p4HAXfk3009878; Tue, 17 May 2011 05:33:41 -0500 From: Peter Ujfalusi To: Tony Lindgren CC: , Liam Girdwood , Jarkko Nikula , Kishon Vijay Abraham I Subject: [PATCH] OMAP4: McBSP: Clear rx_irq at probe time Date: Tue, 17 May 2011 13:33:40 +0300 Message-ID: <1305628420-10592-1-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.7.5.rc3 MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 17 May 2011 10:33:47 +0000 (UTC) On OMAP4 we have one interrupt line per McBSP port. At proble time tx, and rx irq value will be -ENXIO, and only the tx irq will get corrected. In omap_mcbsp_request if the rx_irq is not 0 we proceed, and try to request the interrupt, which will fail on OMAP4 (rx_irq == -6). To avoid this error, clear the rx_irq at probe time on OMAP4. Signed-off-by: Peter Ujfalusi Acked-by: Jarkko Nikula --- arch/arm/plat-omap/mcbsp.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index 5587acf..1e4e32e 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c @@ -1867,8 +1867,10 @@ static int __devinit omap_mcbsp_probe(struct platform_device *pdev) mcbsp->rx_irq = platform_get_irq_byname(pdev, "rx"); /* From OMAP4 there will be a single irq line */ - if (mcbsp->tx_irq == -ENXIO) + if (mcbsp->tx_irq == -ENXIO) { mcbsp->tx_irq = platform_get_irq(pdev, 0); + mcbsp->rx_irq = 0; + } res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "rx"); if (!res) {