linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: richard.genoud@gmail.com (Richard Genoud)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH 13/13] sound: codec: wm8371: correct capture line/mic
Date: Mon,  1 Jul 2013 10:39:38 +0200	[thread overview]
Message-ID: <1372667978-4718-14-git-send-email-richard.genoud@gmail.com> (raw)
In-Reply-To: <1372667978-4718-1-git-send-email-richard.genoud@gmail.com>

With the "switch" text, we can't enable the line and mic capture in
alsamixer.

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
---
 sound/soc/codecs/wm8731.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index 3cf6b20..dae1403 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -164,10 +164,10 @@ SOC_DOUBLE_R("Master Playback ZC Switch", WM8731_LOUT1V, WM8731_ROUT1V,
 
 SOC_DOUBLE_R_TLV("Capture Volume", WM8731_LINVOL, WM8731_RINVOL, 0, 31, 0,
 		 in_tlv),
-SOC_DOUBLE_R("Line Capture Switch", WM8731_LINVOL, WM8731_RINVOL, 7, 1, 1),
+SOC_DOUBLE_R("Line Capture", WM8731_LINVOL, WM8731_RINVOL, 7, 1, 1),
 
 SOC_SINGLE_TLV("Mic Boost Volume", WM8731_APANA, 0, 1, 0, mic_tlv),
-SOC_SINGLE("Mic Capture Switch", WM8731_APANA, 1, 1, 1),
+SOC_SINGLE("Mic Capture", WM8731_APANA, 1, 1, 1),
 
 SOC_SINGLE_TLV("Sidetone Playback Volume", WM8731_APANA, 6, 3, 1,
 	       sidetone_tlv),
-- 
1.7.10.4

      parent reply	other threads:[~2013-07-01  8:39 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-01  8:39 [RFC PATCH 00/13] audio support for at91sam9x5ek board Richard Genoud
2013-07-01  8:39 ` [RFC PATCH 01/13] misc: atmel_ssc: add device tree DMA support Richard Genoud
2013-07-02  3:01   ` Bo Shen
2013-07-02  8:13     ` Richard Genoud
2013-07-02  9:11       ` Bo Shen
2013-07-03 12:21         ` Richard Genoud
2013-07-03 15:51           ` Richard Genoud
2013-07-04  1:15             ` Bo Shen
2013-07-04 13:44               ` Richard Genoud
2013-07-05  1:25                 ` Bo Shen
2013-07-05  7:16                   ` Richard Genoud
2013-07-01  8:39 ` [RFC PATCH 02/13] misc: atmel_ssc: keep the count of pdev->id Richard Genoud
2013-07-02  3:03   ` Bo Shen
2013-07-05 15:16     ` Richard Genoud
2013-07-01  8:39 ` [RFC PATCH 03/13] ARM: at91: DTS: sam9x5: add clock for SSC DT entry Richard Genoud
2013-07-02  3:05   ` Bo Shen
2013-07-05 15:16     ` Richard Genoud
2013-07-01  8:39 ` [RFC PATCH 04/13] ARM: at91: DTS: sam9x5: add SSC DMA parameters Richard Genoud
2013-07-01  8:39 ` [RFC PATCH 05/13] ARM: AT91: DTS: sam9x5ek: add WM8731 codec Richard Genoud
2013-07-01  8:39 ` [RFC PATCH 06/13] ARM: AT91: DTS: sam9x5ek: add sound configuration Richard Genoud
2013-07-01  8:39 ` [RFC PATCH 07/13] ARM: AT91: DTS: sam9x5ek: enable SSC Richard Genoud
2013-07-01  8:39 ` [RFC PATCH 08/13] sound: sam9x5_wm8731: machine driver for at91sam9x5 wm8731 boards Richard Genoud
2013-07-02  3:21   ` Bo Shen
2013-07-05 15:15     ` Richard Genoud
2013-07-05 18:06       ` Mark Brown
2013-07-05 18:12         ` Richard Genoud
2013-07-08  2:01       ` Bo Shen
2013-07-08  7:55         ` Richard Genoud
2013-07-01  8:39 ` [RFC PATCH 09/13] sound: atmel-pcm: don't return ok if pcm-dma is not implemented Richard Genoud
2013-07-01  8:39 ` [RFC PATCH 10/13] sound: atmel_ssc_dai: PM: actually stopping clock on suspend/resume Richard Genoud
2013-07-01  8:39 ` [RFC PATCH 11/13] sound: atmel-pcm-dma: check pointer before dereference Richard Genoud
2013-07-01  8:39 ` [RFC PATCH 12/13] sound: wm8731: rework power management Richard Genoud
2013-07-01  8:39 ` Richard Genoud [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1372667978-4718-14-git-send-email-richard.genoud@gmail.com \
    --to=richard.genoud@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).