| Message ID | 1367997261-32048-2-git-send-email-fabio.baltieri@linaro.org |
|---|---|
| State | Accepted |
| Commit | b9600b4b1cf8b8f06b6a5d025eff160f41950485 |
| Headers | show
Return-Path: <patchwork-forward+bncBDN7FN4YLAIO35VHRQCRUBCO5Y3WS@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-gg0-f197.google.com (mail-gg0-f197.google.com [209.85.161.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1B0C0238FB for <linaro@patches.linaro.org>; Wed, 8 May 2013 07:15:14 +0000 (UTC) Received: by mail-gg0-f197.google.com with SMTP id w6sf1609195ggk.8 for <linaro@patches.linaro.org>; Wed, 08 May 2013 00:14:53 -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=i3ArCoZFyD/mrqplkfBSGtaVDvPjZxFxamO0oR6sdrg=; b=iAqorUCmA/GFZpClD3mpmZcDpRV5umcpj3HhCegde5ff6ceTIIzWWN1fgKmoqWgZhu KhqI/jVt4Bk2hiNOJ+gCAJUUH9iP9GqEcATtC+6iJo1jeH3m8C0TCdb8aJJOdN4sZ+qc 7yDSpUAzSq2DTOeR27ZUdwuPN3oHa8oLGFOQi6J3ufIVSFpPa+ZT2doGH0qRtlY9rxCR y4kD7XgIiZFcW0Gc09e3qD9m18/79Xbcn7NCqIsN+XwAyHgOQqrJ/gow6RDYJfYFIttq z+tugLtv0DHfbCWlFW90DhJSTV908V+lVh0BC4JI5WdAhbGDRQPWEvtQtmMMljPP6KgB rJZQ== X-Received: by 10.236.8.66 with SMTP id 42mr3189841yhq.55.1367997293395; Wed, 08 May 2013 00:14:53 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.4.71 with SMTP id i7ls759166qei.86.gmail; Wed, 08 May 2013 00:14:53 -0700 (PDT) X-Received: by 10.52.122.109 with SMTP id lr13mr3122605vdb.91.1367997293240; Wed, 08 May 2013 00:14:53 -0700 (PDT) Received: from mail-ve0-x229.google.com (mail-ve0-x229.google.com [2607:f8b0:400c:c01::229]) by mx.google.com with ESMTPS id k19si14508095vcu.60.2013.05.08.00.14.53 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 May 2013 00:14:53 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::229 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::229; Received: by mail-ve0-f169.google.com with SMTP id jz10so1455625veb.14 for <patchwork-forward@linaro.org>; Wed, 08 May 2013 00:14:53 -0700 (PDT) X-Received: by 10.58.173.36 with SMTP id bh4mr3695766vec.9.1367997293100; Wed, 08 May 2013 00:14:53 -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 nf2csp141007veb; Wed, 8 May 2013 00:14:52 -0700 (PDT) X-Received: by 10.180.74.172 with SMTP id u12mr23860190wiv.0.1367997291945; Wed, 08 May 2013 00:14:51 -0700 (PDT) Received: from mail-wg0-x22b.google.com (mail-wg0-x22b.google.com [2a00:1450:400c:c00::22b]) by mx.google.com with ESMTPS id hq13si1551393wib.8.2013.05.08.00.14.51 for <patches@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 May 2013 00:14:51 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c00::22b is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) client-ip=2a00:1450:400c:c00::22b; Received: by mail-wg0-f43.google.com with SMTP id c11so1529002wgh.10 for <patches@linaro.org>; Wed, 08 May 2013 00:14:51 -0700 (PDT) X-Received: by 10.180.212.3 with SMTP id ng3mr8064849wic.22.1367997291478; Wed, 08 May 2013 00:14:51 -0700 (PDT) Received: from localhost ([2a01:2003:1:1025:8e70:5aff:feac:ad8]) by mx.google.com with ESMTPSA id c5sm7224000wiz.11.2013.05.08.00.14.44 for <multiple recipients> (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 08 May 2013 00:14:50 -0700 (PDT) From: Fabio Baltieri <fabio.baltieri@linaro.org> To: Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com> Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Linus Walleij <linus.walleij@linaro.org>, Lee Jones <lee.jones@linaro.org>, Ola Lilja <ola.o.lilja@stericsson.com>, Fabio Baltieri <fabio.baltieri@linaro.org> Subject: [PATCH 1/6] ASoC: ab8500-codec: Add missing ad_to_slot definitions Date: Wed, 8 May 2013 09:14:16 +0200 Message-Id: <1367997261-32048-2-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: ALoCoQmMZ98bloMpW2O77N8xqsrunx+njuB+b0YY99uSmF/03E7ExiFyUsmTED8VaG+1Qd7nS+wD X-Original-Sender: fabio.baltieri@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::229 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: <patchwork-forward.linaro.org> X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post?hl=en-US>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?hl=en-US&topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/?hl=en-US> List-Unsubscribe: <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe?hl=en-US>, <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com> |
diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c index a153b16..3126cac 100644 --- a/sound/soc/codecs/ab8500-codec.c +++ b/sound/soc/codecs/ab8500-codec.c @@ -1496,6 +1496,12 @@ static const char * const enum_ad_to_slot_map[] = {"AD_OUT1", "AD_OUT7", "AD_OUT8", "zeroes", + "zeroes", + "zeroes", + "zeroes", + "tristate", + "tristate", + "tristate", "tristate"}; static SOC_ENUM_SINGLE_DECL(soc_enum_adslot0map, AB8500_ADSLOTSEL1, AB8500_ADSLOTSELX_EVEN_SHIFT,
According to the AB8500 user manual AD to Slot register multiplexer accept values from 0 to 15 where: 0 to 7 corresponds to AD_OUTx slots 8 to 11 corresponds to zero output 12 to 15 sets the output in tristate mode Update enum_ad_to_slot_map array to reflect this definition. This also allows alsamixer to properly display the default configuration, as all controls are set to tristate (=12) at reset. Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org> --- sound/soc/codecs/ab8500-codec.c | 6 ++++++ 1 file changed, 6 insertions(+)