From patchwork Wed May 8 07:14:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Baltieri X-Patchwork-Id: 16778 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-gg0-f198.google.com (mail-gg0-f198.google.com [209.85.161.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A4103238FB for ; Wed, 8 May 2013 07:16:03 +0000 (UTC) Received: by mail-gg0-f198.google.com with SMTP id p4sf1612936ggn.1 for ; Wed, 08 May 2013 00:15:43 -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=K5ChzcuumH7/fpwNJEyz9KNFROVXSyGl84PL1M6E9zA=; b=W4D+jUfDu/cE5fsLuoRPnVCjwpn9yla49sn56t0ab/1xWIq9boV4zmXPSm7SnhJYGF lljurU864TyPeXS3+OEP67huu/I0ADUU+xijUe8FLZJqqk36HbIWMsgE1hQkjKXTVX1b +Ij5vRnlXBx2eKMv9nzHWINk402K+y1mQ7H15A+AD5Bndo6aNHM4xwHSrpLolkVJUwYd SxjO7FEk8RX5rzG+b/2usggsTws9hPTrXDgmgnkHD5Cclzli1YSoc6+cwBLAKksbITkQ 3HfdRLCuVIxi/eqGz+fJOUL9W81H7Rjvmxyuh0jyGeYqKqiotV+MGYT27TN40h6tSZE9 /yow== X-Received: by 10.224.42.141 with SMTP id s13mr6927584qae.3.1367997343080; Wed, 08 May 2013 00:15:43 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.74.66 with SMTP id r2ls838372qev.48.gmail; Wed, 08 May 2013 00:15:42 -0700 (PDT) X-Received: by 10.58.106.76 with SMTP id gs12mr3690292veb.15.1367997342898; Wed, 08 May 2013 00:15:42 -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 gr7si14501874vdc.129.2013.05.08.00.15.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 May 2013 00:15:42 -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 ox1so1467163veb.18 for ; Wed, 08 May 2013 00:15:42 -0700 (PDT) X-Received: by 10.220.82.68 with SMTP id a4mr3584408vcl.49.1367997342807; Wed, 08 May 2013 00:15:42 -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 nf2csp141041veb; Wed, 8 May 2013 00:15:42 -0700 (PDT) X-Received: by 10.194.83.33 with SMTP id n1mr8399222wjy.7.1367997341842; Wed, 08 May 2013 00:15:41 -0700 (PDT) Received: from mail-wg0-x234.google.com (mail-wg0-x234.google.com [2a00:1450:400c:c00::234]) by mx.google.com with ESMTPS id eh4si1543896wic.69.2013.05.08.00.15.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 May 2013 00:15:41 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c00::234 is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) client-ip=2a00:1450:400c:c00::234; Received: by mail-wg0-f52.google.com with SMTP id k13so1468734wgh.31 for ; Wed, 08 May 2013 00:15:41 -0700 (PDT) X-Received: by 10.180.183.210 with SMTP id eo18mr19562289wic.17.1367997341468; Wed, 08 May 2013 00:15:41 -0700 (PDT) Received: from localhost ([2a01:2003:1:1025:8e70:5aff:feac:ad8]) by mx.google.com with ESMTPSA id q20sm7878640wiv.7.2013.05.08.00.15.35 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 08 May 2013 00:15:40 -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 6/6] ASoC: ux500: Use the first two AD slots for capture Date: Wed, 8 May 2013 09:14:21 +0200 Message-Id: <1367997261-32048-7-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: ALoCoQkWhj6UzJjCuBmJzsLHTVmlkwPJ3+KsuoKgyRsoYEMJJWheqKIMg/x9dQLgjgs6loVWpOnf 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: , Set AD_OUT1 and AD_OUT2, corresponding to LINL and LINR pins, as the default input slots for the capture interfaces. Signed-off-by: Fabio Baltieri --- sound/soc/codecs/ab8500-codec.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c index 7c026d4..9dafd52 100644 --- a/sound/soc/codecs/ab8500-codec.c +++ b/sound/soc/codecs/ab8500-codec.c @@ -2334,17 +2334,18 @@ static int ab8500_codec_set_dai_tdm_slot(struct snd_soc_dai *dai, case 0: break; case 1: - /* AD_OUT3 -> slot 0 & 1 */ - snd_soc_update_bits(codec, AB8500_ADSLOTSEL1, AB8500_MASK_ALL, - AB8500_ADSLOTSELX_AD_OUT3_TO_SLOT_EVEN | - AB8500_ADSLOTSELX_AD_OUT3_TO_SLOT_ODD); + /* AD_OUT1 -> slot 0 & 1 */ + snd_soc_update_bits(codec, AB8500_ADSLOTSEL1, + AB8500_MASK_ALL, + AB8500_ADSLOTSELX_AD_OUT1_TO_SLOT_EVEN | + AB8500_ADSLOTSELX_AD_OUT1_TO_SLOT_ODD); break; case 2: - /* AD_OUT3 -> slot 0, AD_OUT2 -> slot 1 */ + /* AD_OUT1 -> slot 0, AD_OUT2 -> slot 1 */ snd_soc_update_bits(codec, AB8500_ADSLOTSEL1, AB8500_MASK_ALL, - AB8500_ADSLOTSELX_AD_OUT3_TO_SLOT_EVEN | + AB8500_ADSLOTSELX_AD_OUT1_TO_SLOT_EVEN | AB8500_ADSLOTSELX_AD_OUT2_TO_SLOT_ODD); break; case 8: