From patchwork Thu Aug 13 14:35:30 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 41068 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 n7DEnE1B025704 for ; Thu, 13 Aug 2009 14:49:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753933AbZHMOtJ (ORCPT ); Thu, 13 Aug 2009 10:49:09 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754151AbZHMOtG (ORCPT ); Thu, 13 Aug 2009 10:49:06 -0400 Received: from smtp.nokia.com ([192.100.122.233]:38998 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753933AbZHMOs6 (ORCPT ); Thu, 13 Aug 2009 10:48:58 -0400 Received: from esebh105.NOE.Nokia.com (esebh105.ntc.nokia.com [172.21.138.211]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n7DEmUsb012246; Thu, 13 Aug 2009 17:48:45 +0300 Received: from vaebh102.NOE.Nokia.com ([10.160.244.23]) by esebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 13 Aug 2009 17:48:54 +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:44 +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 17/20] ASoC: Add runtime check for RFIG and XFIG Date: Thu, 13 Aug 2009 17:35:30 +0300 Message-Id: <1250174133-451-18-git-send-email-eduardo.valentin@nokia.com> X-Mailer: git-send-email 1.6.2.GIT In-Reply-To: <1250174133-451-17-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> <1250174133-451-14-git-send-email-eduardo.valentin@nokia.com> <1250174133-451-15-git-send-email-eduardo.valentin@nokia.com> <1250174133-451-16-git-send-email-eduardo.valentin@nokia.com> <1250174133-451-17-git-send-email-eduardo.valentin@nokia.com> X-OriginalArrivalTime: 13 Aug 2009 14:48:42.0878 (UTC) FILETIME=[2718B9E0: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 This is, no RFIG or XFIG (Not defined in 34xx), correct initiliazation of rccr and xccr. Signed-off-by: Eero Nurkkala --- sound/soc/omap/omap-mcbsp.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index a5d46a7..8f361b1 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -321,8 +321,11 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai, /* Generic McBSP register settings */ regs->spcr2 |= XINTM(3) | FREE; regs->spcr1 |= RINTM(3); - regs->rcr2 |= RFIG; - regs->xcr2 |= XFIG; + /* RFIG and XFIG are not defined in 34xx */ + if (!cpu_is_omap34xx()) { + regs->rcr2 |= RFIG; + regs->xcr2 |= XFIG; + } if (cpu_is_omap2430() || cpu_is_omap34xx()) { regs->xccr = DXENDLY(1) | XDMAEN; regs->rccr = RFULL_CYCLE | RDMAEN;