From patchwork Wed May 8 07:14:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Baltieri X-Patchwork-Id: 16776 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f70.google.com (mail-qa0-f70.google.com [209.85.216.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 05FF0238FB for ; Wed, 8 May 2013 07:15:44 +0000 (UTC) Received: by mail-qa0-f70.google.com with SMTP id bv4sf2129808qab.1 for ; Wed, 08 May 2013 00:15:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=WpbjMBZ/U+d8zLwTu44tz3tdS4RWbAJvsSaDtG96Erc=; b=LlgD8LSSwumk/FY4U38zTOydUcEZLefR5fC1B/pAQz9B1IRdAJVFSOpAXGg89KBvhk HJK0Y6/wDHwb/rYR79zx4q8ToLp28IJlpuY3+di2SzDSE1LGjsnbU8SWG4Ey6HRJ+uHJ hIqBS/M6qQQ7xT3nDKKSOpW0Tx1lnjLvBBT0TjIJboN3rCkVAFvO1TEzqnRjjOlBDPab +IiDIRgA98yCdsE/G4YL3Rswhiqy4a88d9d6x/z9r/0umNR/AmtZlzm4UMWZ7SGHK3Gt yJH1q4aaGFd55mLiqwZbUiT4q19pxnN1j4MFUlKeXi+TLHSJlGh5Z5ck19WGKZEY3gSc I6fQ== X-Received: by 10.224.42.141 with SMTP id s13mr6927204qae.3.1367997323512; Wed, 08 May 2013 00:15:23 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.121.229 with SMTP id ln5ls742059qeb.36.gmail; Wed, 08 May 2013 00:15:23 -0700 (PDT) X-Received: by 10.52.176.10 with SMTP id ce10mr3074713vdc.74.1367997323317; Wed, 08 May 2013 00:15:23 -0700 (PDT) Received: from mail-ve0-x22d.google.com (mail-ve0-x22d.google.com [2607:f8b0:400c:c01::22d]) by mx.google.com with ESMTPS id og3si14531135vcb.6.2013.05.08.00.15.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 May 2013 00:15:23 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::22d is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::22d; Received: by mail-ve0-f173.google.com with SMTP id ox1so1466972veb.18 for ; Wed, 08 May 2013 00:15:23 -0700 (PDT) X-Received: by 10.220.168.6 with SMTP id s6mr2590071vcy.41.1367997323225; Wed, 08 May 2013 00:15:23 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp141029veb; Wed, 8 May 2013 00:15:22 -0700 (PDT) X-Received: by 10.194.19.104 with SMTP id d8mr8334800wje.24.1367997322045; Wed, 08 May 2013 00:15:22 -0700 (PDT) Received: from mail-wg0-x22a.google.com (mail-wg0-x22a.google.com [2a00:1450:400c:c00::22a]) by mx.google.com with ESMTPS id gk2si1543460wib.70.2013.05.08.00.15.21 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 May 2013 00:15:22 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c00::22a is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) client-ip=2a00:1450:400c:c00::22a; Received: by mail-wg0-f42.google.com with SMTP id j13so4773364wgh.1 for ; Wed, 08 May 2013 00:15:21 -0700 (PDT) X-Received: by 10.180.76.103 with SMTP id j7mr8067901wiw.21.1367997321663; Wed, 08 May 2013 00:15:21 -0700 (PDT) Received: from localhost ([2a01:2003:1:1025:8e70:5aff:feac:ad8]) by mx.google.com with ESMTPSA id x13sm7899617wib.3.2013.05.08.00.15.15 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 08 May 2013 00:15:21 -0700 (PDT) From: Fabio Baltieri To: Mark Brown , Liam Girdwood Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Linus Walleij , Lee Jones , Ola Lilja , Fabio Baltieri Subject: [PATCH 4/6] ASoC: ux500: Update tx tdm slots configuration Date: Wed, 8 May 2013 09:14:19 +0200 Message-Id: <1367997261-32048-5-git-send-email-fabio.baltieri@linaro.org> X-Mailer: git-send-email 1.8.2 In-Reply-To: <1367997261-32048-1-git-send-email-fabio.baltieri@linaro.org> References: <1367997261-32048-1-git-send-email-fabio.baltieri@linaro.org> X-Gm-Message-State: ALoCoQkkwNoEZnFu+xfNp9nHkWttjgbKneSsp1tum9UetR5O0tGFEA3OZpCk0AuAY7lWsBx62MLs X-Original-Sender: fabio.baltieri@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::22d is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Update ab8500-codec and mop500_ab8500 tx slot configuration to reflect the actual one used by STE. Also update a wrong comment in the process. Signed-off-by: Fabio Baltieri --- sound/soc/codecs/ab8500-codec.c | 20 ++++++++++---------- sound/soc/ux500/mop500_ab8500.c | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c index 3126cac..7c026d4 100644 --- a/sound/soc/codecs/ab8500-codec.c +++ b/sound/soc/codecs/ab8500-codec.c @@ -2300,18 +2300,18 @@ static int ab8500_codec_set_dai_tdm_slot(struct snd_soc_dai *dai, case 0: break; case 1: - /* Slot 9 -> DA_IN1 & DA_IN3 */ - snd_soc_update_bits(codec, AB8500_DASLOTCONF1, mask, 11); - snd_soc_update_bits(codec, AB8500_DASLOTCONF3, mask, 11); - snd_soc_update_bits(codec, AB8500_DASLOTCONF2, mask, 11); - snd_soc_update_bits(codec, AB8500_DASLOTCONF4, mask, 11); + /* Slot 8 -> DA_IN1 to DA_IN4 */ + snd_soc_update_bits(codec, AB8500_DASLOTCONF1, mask, 8); + snd_soc_update_bits(codec, AB8500_DASLOTCONF3, mask, 8); + snd_soc_update_bits(codec, AB8500_DASLOTCONF2, mask, 8); + snd_soc_update_bits(codec, AB8500_DASLOTCONF4, mask, 8); break; case 2: - /* Slot 9 -> DA_IN1 & DA_IN3, Slot 11 -> DA_IN2 & DA_IN4 */ - snd_soc_update_bits(codec, AB8500_DASLOTCONF1, mask, 9); - snd_soc_update_bits(codec, AB8500_DASLOTCONF3, mask, 9); - snd_soc_update_bits(codec, AB8500_DASLOTCONF2, mask, 11); - snd_soc_update_bits(codec, AB8500_DASLOTCONF4, mask, 11); + /* Slot 8 -> DA_IN1 & DA_IN3, Slot 9 -> DA_IN2 & DA_IN4 */ + snd_soc_update_bits(codec, AB8500_DASLOTCONF1, mask, 8); + snd_soc_update_bits(codec, AB8500_DASLOTCONF3, mask, 8); + snd_soc_update_bits(codec, AB8500_DASLOTCONF2, mask, 9); + snd_soc_update_bits(codec, AB8500_DASLOTCONF4, mask, 9); break; case 8: diff --git a/sound/soc/ux500/mop500_ab8500.c b/sound/soc/ux500/mop500_ab8500.c index 4606194..44899f7 100644 --- a/sound/soc/ux500/mop500_ab8500.c +++ b/sound/soc/ux500/mop500_ab8500.c @@ -28,8 +28,8 @@ #include "ux500_msp_dai.h" #include "../codecs/ab8500-codec.h" -#define TX_SLOT_MONO 0x0008 -#define TX_SLOT_STEREO 0x000a +#define TX_SLOT_MONO 0x0001 +#define TX_SLOT_STEREO 0x0003 #define RX_SLOT_MONO 0x0001 #define RX_SLOT_STEREO 0x0003 #define TX_SLOT_8CH 0x00FF