From patchwork Thu Aug 13 14:35:26 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 41060 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7DEn0ST025632 for ; Thu, 13 Aug 2009 14:49:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754135AbZHMOsz (ORCPT ); Thu, 13 Aug 2009 10:48:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754137AbZHMOsw (ORCPT ); Thu, 13 Aug 2009 10:48:52 -0400 Received: from smtp.nokia.com ([192.100.122.233]:38974 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753732AbZHMOst (ORCPT ); Thu, 13 Aug 2009 10:48:49 -0400 Received: from esebh106.NOE.Nokia.com (esebh106.ntc.nokia.com [172.21.138.213]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n7DEmXSf012260; Thu, 13 Aug 2009 17:48:36 +0300 Received: from vaebh102.NOE.Nokia.com ([10.160.244.23]) by esebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 13 Aug 2009 17:48:44 +0300 Received: from vaebe101.NOE.Nokia.com ([10.160.244.11]) by vaebh102.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 13 Aug 2009 17:48:43 +0300 Received: from localhost.localdomain ([172.21.41.99]) by vaebe101.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 13 Aug 2009 17:48:42 +0300 From: Eduardo Valentin To: Linux-OMAP , ALSA-Devel Cc: Jarkko Nikula , "\\\"Ujfalusi Peter (Nokia-D/Tampere)\\\"" , "Nurkkala Eero.An (EXT-Offcode/Oulu)" , Eero Nurkkala Subject: [PATCHv3 13/20] OMAP: McBSP: Do not enable wakeups for no-idle mode Date: Thu, 13 Aug 2009 17:35:26 +0300 Message-Id: <1250174133-451-14-git-send-email-eduardo.valentin@nokia.com> X-Mailer: git-send-email 1.6.2.GIT In-Reply-To: <1250174133-451-13-git-send-email-eduardo.valentin@nokia.com> References: <1250174133-451-1-git-send-email-eduardo.valentin@nokia.com> <1250174133-451-2-git-send-email-eduardo.valentin@nokia.com> <1250174133-451-3-git-send-email-eduardo.valentin@nokia.com> <1250174133-451-4-git-send-email-eduardo.valentin@nokia.com> <1250174133-451-5-git-send-email-eduardo.valentin@nokia.com> <1250174133-451-6-git-send-email-eduardo.valentin@nokia.com> <1250174133-451-7-git-send-email-eduardo.valentin@nokia.com> <1250174133-451-8-git-send-email-eduardo.valentin@nokia.com> <1250174133-451-9-git-send-email-eduardo.valentin@nokia.com> <1250174133-451-10-git-send-email-eduardo.valentin@nokia.com> <1250174133-451-11-git-send-email-eduardo.valentin@nokia.com> <1250174133-451-12-git-send-email-eduardo.valentin@nokia.com> <1250174133-451-13-git-send-email-eduardo.valentin@nokia.com> X-OriginalArrivalTime: 13 Aug 2009 14:48:42.0753 (UTC) FILETIME=[2705A710:01CA1C25] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: Eero Nurkkala When no-idle mode is taken, wakeups need not to be enabled. Moreover, CLOCKACTIVITY bits are unnecessary with this mode also. Signed-off-by: Eero Nurkkala Acked-by: Eduardo Valentin --- arch/arm/plat-omap/mcbsp.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index 8a78b61..c6df47d 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c @@ -319,16 +319,17 @@ static inline void omap34xx_mcbsp_request(struct omap_mcbsp *mcbsp) syscon &= ~(ENAWAKEUP | SIDLEMODE(0x03) | CLOCKACTIVITY(0x03)); spin_lock_irq(&mcbsp->lock); - if (mcbsp->dma_op_mode == MCBSP_DMA_MODE_THRESHOLD) - syscon |= SIDLEMODE(0x02); - else + if (mcbsp->dma_op_mode == MCBSP_DMA_MODE_THRESHOLD) { + syscon |= (ENAWAKEUP | SIDLEMODE(0x02) | + CLOCKACTIVITY(0x02)); + OMAP_MCBSP_WRITE(mcbsp->io_base, WAKEUPEN, + XRDYEN | RRDYEN); + } else { syscon |= SIDLEMODE(0x01); + } spin_unlock_irq(&mcbsp->lock); - syscon |= (ENAWAKEUP | CLOCKACTIVITY(0x02)); OMAP_MCBSP_WRITE(mcbsp->io_base, SYSCON, syscon); - - OMAP_MCBSP_WRITE(mcbsp->io_base, WAKEUPEN, XRDYEN | RRDYEN); } }