From patchwork Thu Apr 21 18:19:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Gardiner X-Patchwork-Id: 725311 Received: from arroyo.ext.ti.com (arroyo.ext.ti.com [192.94.94.40]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3LINaix014549 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 21 Apr 2011 18:23:57 GMT Received: from dlep35.itg.ti.com ([157.170.170.118]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id p3LIJKw1013638 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 21 Apr 2011 13:19:21 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id p3LIJIDX025038; Thu, 21 Apr 2011 13:19:20 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 11DD680628; Thu, 21 Apr 2011 13:19:18 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp53.itg.ti.com (dflp53.itg.ti.com [128.247.5.6]) by linux.omap.com (Postfix) with ESMTP id 9DF1880627 for ; Thu, 21 Apr 2011 13:19:14 -0500 (CDT) Received: from neches.ext.ti.com (localhost [127.0.0.1]) by dflp53.itg.ti.com (8.13.8/8.13.8) with ESMTP id p3LIJEwD011156 for ; Thu, 21 Apr 2011 13:19:14 -0500 (CDT) Received: from psmtp.com (na3sys009amx258.postini.com [74.125.149.142]) by neches.ext.ti.com (8.13.7/8.13.7) with SMTP id p3LIJDuk014568 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 21 Apr 2011 13:19:14 -0500 Received: from na3sys009aog113.obsmtp.com ([209.85.218.49]) (using TLSv1) by na3sys009amx258.postini.com ([74.125.148.10]) with SMTP; Thu, 21 Apr 2011 11:19:14 PDT Received: from mail-yi0-f49.google.com ([209.85.218.49]) (using TLSv1) by na3sys009aob113.postini.com ([74.125.148.12]) with SMTP ID DSNKTbB1IYTO8tCvdk3N1eWDrWafNY8JYA9S@postini.com; Thu, 21 Apr 2011 11:19:14 PDT Received: by mail-yi0-f49.google.com with SMTP id 15so693356yic.8 for ; Thu, 21 Apr 2011 11:19:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nanometrics.ca; s=google; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=i2495ksDPPiaLj2Yl1foSCq1sfreIwhUPe6IvOd5ngM=; b=DPJqnSznotF7Xrso6jAtkf3g73orPiWZOmB1rianFNbt1hq8SNQuCek28HPs4DH2e6 b+hEXPtaue2xfPLr/L0LFucxvpXq/t+FwbWGy/GEEhKrsP15+7mcHT90ZmsoUHuY75Wd 76aQWuKjudrL4ShLNXUuegGaMiiEp2cGpMPuM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=nanometrics.ca; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=CtzjChlFmqsNgcud4CjovLzcH+qnbd40iUNnMZ99fJl4UQ7YicJe9CN8njlvBQ5t6d GVPxcVbQprSGCAvH4LqRoKeSd8+j0VTcDQE0u/LSQZgIB7OM3GW2nGld225GUXZlKLYA 7dwdpvMLDK/ycs4PYKmOfElk9s2WLWyqvnXjo= Received: by 10.236.177.98 with SMTP id c62mr279380yhm.352.1303409953206; Thu, 21 Apr 2011 11:19:13 -0700 (PDT) Received: from localhost.localdomain ([206.191.47.130]) by mx.google.com with ESMTPS id 13sm940691yhl.72.2011.04.21.11.19.11 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 21 Apr 2011 11:19:12 -0700 (PDT) From: Ben Gardiner To: Liam Girdwood , alsa-devel@alsa-project.org Subject: [PATCH 4/4] davinci-mcasp: fix _CBM_CFS pin directions Date: Thu, 21 Apr 2011 14:19:04 -0400 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: X-pstn-neptune: 0/0/0.00/0 X-pstn-levels: (S:99.90000/99.90000 CV:99.9000 FC:95.5390 LC:95.5390 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) X-pstn-settings: 2 (0.5000:0.0750) s cv GT3 gt2 gt1 r p m c X-pstn-addresses: from [db-null] Cc: davinci-linux-open-source@linux.davincidsp.com, Takashi Iwai , Mark Brown , linux-kernel@vger.kernel.org, Jaroslav Kysela X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: davinci-linux-open-source-bounces@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com X-Greylist: Sender succeeded STARTTLS authentication, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 21 Apr 2011 18:23:57 +0000 (UTC) The current davinci_mcasp_set_dai_fmt() sets bits ACLKX and ACLKR in the PDIR register for the codec clock-master/frame-slave mode; however, this results in the ACLKX and ACLKR pins being outputs according to SPRUFM1 [1] which conflicts with "codec is clock master." Similarly to the previous patch in this series, "fix _CBM_CFS hw_params" -- For codec clock-master/frame-slave mode (_CMB_CFS), clear bits ACLKX and ACLKR in the PDIR register to set the pins as inputs and hence allow externally sourced bit-clocks. [1] http://www.ti.com/litv/pdf/sprufm1 Signed-off-by: Ben Gardiner Reviewed-by: James Nuss --- sound/soc/davinci/davinci-mcasp.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 8004643..0a3d891 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -445,8 +445,10 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai, mcasp_clr_bits(base + DAVINCI_MCASP_ACLKRCTL_REG, ACLKRE); mcasp_set_bits(base + DAVINCI_MCASP_RXFMCTL_REG, AFSRE); + mcasp_clr_bits(base + DAVINCI_MCASP_PDIR_REG, + ACLKX | ACLKR); mcasp_set_bits(base + DAVINCI_MCASP_PDIR_REG, - ACLKX | AFSX | ACLKR | AFSR); + AFSX | AFSR); break; case SND_SOC_DAIFMT_CBM_CFM: /* codec is clock and frame master */