From patchwork Thu Feb 18 21:07:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suman Anna X-Patchwork-Id: 80437 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1IL7TSE025606 for ; Thu, 18 Feb 2010 21:07:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753455Ab0BRVH3 (ORCPT ); Thu, 18 Feb 2010 16:07:29 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:49776 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753151Ab0BRVH3 convert rfc822-to-8bit (ORCPT ); Thu, 18 Feb 2010 16:07:29 -0500 Received: from dlep33.itg.ti.com ([157.170.170.112]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id o1IL7PgK020233 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 18 Feb 2010 15:07:25 -0600 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 o1IL7PsL003027; Thu, 18 Feb 2010 15:07:25 -0600 (CST) 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 o1IL7PVY004271; Thu, 18 Feb 2010 15:07:25 -0600 (CST) Received: from dlee04.ent.ti.com ([157.170.170.9]) by dlee73.ent.ti.com ([157.170.170.88]) with mapi; Thu, 18 Feb 2010 15:07:25 -0600 From: "Anna, Suman" To: "linux-omap@vger.kernel.org" CC: "Hiroshi.DOYU@nokia.com" , "Clark, Rob" , "Kanigeri, Hari" , "C.A, Subramaniam" Date: Thu, 18 Feb 2010 15:07:24 -0600 Subject: [PATCH 3/5] omap: mailbox: correct OMAP4 SIDLEMODE logic Thread-Topic: [PATCH 3/5] omap: mailbox: correct OMAP4 SIDLEMODE logic Thread-Index: Acqw3l4EsbGLMbroRC6bM5eCKQQJJw== Message-ID: <2C1563023E232C49B9F505633D57C2DA2640D0235D@dlee04.ent.ti.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US 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.3 (demeter.kernel.org [140.211.167.41]); Thu, 18 Feb 2010 21:07:30 +0000 (UTC) diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c index 88e9043..e0c1f1b 100644 --- a/arch/arm/mach-omap2/mailbox.c +++ b/arch/arm/mach-omap2/mailbox.c @@ -41,6 +41,8 @@ #define SOFTRESET (1 << 1) #define SMARTIDLE (2 << 3) #define OMAP4_SOFTRESET (1 << 0) +#define OMAP4_NOIDLE (1 << 2) +#define OMAP4_SMARTIDLE (2 << 2) /* SYSSTATUS: register bit definition */ #define RESETDONE (1 << 0) @@ -131,7 +133,10 @@ static int omap2_mbox_startup(struct omap_mbox *mbox) l = mbox_read_reg(MAILBOX_REVISION); pr_info("omap mailbox rev %d.%d\n", (l & 0xf0) >> 4, (l & 0x0f)); - l = SMARTIDLE | AUTOIDLE; + if (cpu_is_omap44xx()) + l = OMAP4_SMARTIDLE; + else + l = SMARTIDLE | AUTOIDLE; mbox_write_reg(l, MAILBOX_SYSCONFIG); omap2_mbox_enable_irq(mbox, IRQ_RX);