From patchwork Wed Nov 10 18:00:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kanigeri, Hari" X-Patchwork-Id: 315072 X-Patchwork-Delegate: hiroshi.doyu@nokia.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 oAAHxDgb014217 for ; Wed, 10 Nov 2010 17:59:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754837Ab0KJR7D (ORCPT ); Wed, 10 Nov 2010 12:59:03 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:56330 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754613Ab0KJR7B (ORCPT ); Wed, 10 Nov 2010 12:59:01 -0500 Received: from dlep36.itg.ti.com ([157.170.170.91]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id oAAHwngD023740 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 10 Nov 2010 11:58:49 -0600 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id oAAHwnlx004308; Wed, 10 Nov 2010 11:58:49 -0600 (CST) Received: from localhost (matrix.am.dhcp.ti.com [128.247.75.166]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id oAAHwmf02364; Wed, 10 Nov 2010 11:58:48 -0600 (CST) From: Hari Kanigeri To: Hiroshi Doyu , linux omap Cc: Tony Lindgren , Linux ARM , Hari Kanigeri Subject: [PATCH v2 2/6] OMAP: mailbox: fix rx interrupt disable in omap4 Date: Wed, 10 Nov 2010 12:00:14 -0600 Message-Id: <1289412018-18860-3-git-send-email-h-kanigeri2@ti.com> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1289412018-18860-1-git-send-email-h-kanigeri2@ti.com> References: <1289412018-18860-1-git-send-email-h-kanigeri2@ti.com> 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.3 (demeter1.kernel.org [140.211.167.41]); Wed, 10 Nov 2010 17:59:13 +0000 (UTC) diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c index 42dbfa4..82b5ced 100644 --- a/arch/arm/mach-omap2/mailbox.c +++ b/arch/arm/mach-omap2/mailbox.c @@ -195,7 +195,10 @@ static void omap2_mbox_disable_irq(struct omap_mbox *mbox, struct omap_mbox2_priv *p = (struct omap_mbox2_priv *)mbox->priv; u32 l, bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit; l = mbox_read_reg(p->irqdisable); - l &= ~bit; + if (cpu_is_omap44xx()) + l |= bit; + else + l &= ~bit; mbox_write_reg(l, p->irqdisable); }