alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Leon Romanovsky <leon@leon.nu>
To: lrg@ti.com, broonie@opensource.wolfsonmicro.com,
	alsa-devel@alsa-project.org
Cc: Paul Fertser <fercerpav@gmail.com>, Leon Romanovsky <leon@leon.nu>
Subject: [PATCH 11/12] ASoC: alc5632: Fix Capture/Playback attributes for microphone inputs
Date: Sat, 11 Feb 2012 23:10:44 +0200	[thread overview]
Message-ID: <1328994645-8237-12-git-send-email-leon@leon.nu> (raw)
In-Reply-To: <1328994645-8237-1-git-send-email-leon@leon.nu>

From: Paul Fertser <fercerpav@gmail.com>

According to the mixer path diagram input sources' attenuators logically
belong to the playback path and DMIC boost only affects capture.

Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Signed-off-by: Leon Romanovsky <leon@leon.nu>
---
 sound/soc/codecs/alc5632.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c
index e52fb81..94f6a2a 100644
--- a/sound/soc/codecs/alc5632.c
+++ b/sound/soc/codecs/alc5632.c
@@ -177,17 +177,17 @@ static const struct snd_kcontrol_new alc5632_snd_controls[] = {
 			ALC5632_VOICE_DAC_VOL, 0, 63, 0, vdac_tlv),
 	SOC_SINGLE("Voice DAC Playback Switch",
 			ALC5632_VOICE_DAC_VOL, 12, 1, 1),
-	SOC_SINGLE_TLV("Phone Capture Volume",
+	SOC_SINGLE_TLV("Phone Playback Volume",
 			ALC5632_PHONE_IN_VOL, 8, 31, 1, vol_tlv),
-	SOC_DOUBLE_TLV("LineIn Capture Volume",
+	SOC_DOUBLE_TLV("LineIn Playback Volume",
 			ALC5632_LINE_IN_VOL, 8, 0, 31, 1, vol_tlv),
 	SOC_DOUBLE_TLV("Master Playback Volume",
 			ALC5632_STEREO_DAC_IN_VOL, 8, 0, 63, 1, vdac_tlv),
 	SOC_DOUBLE("Master Playback Switch",
 			ALC5632_STEREO_DAC_IN_VOL, 15, 7, 1, 1),
-	SOC_SINGLE_TLV("Mic1 Capture Volume",
+	SOC_SINGLE_TLV("Mic1 Playback Volume",
 			ALC5632_MIC_VOL, 8, 31, 1, vol_tlv),
-	SOC_SINGLE_TLV("Mic2 Capture Volume",
+	SOC_SINGLE_TLV("Mic2 Playback Volume",
 			ALC5632_MIC_VOL, 0, 31, 1, vol_tlv),
 	SOC_DOUBLE_TLV("Rec Capture Volume",
 			ALC5632_ADC_REC_GAIN, 8, 0, 31, 0, adc_rec_tlv),
@@ -195,7 +195,7 @@ static const struct snd_kcontrol_new alc5632_snd_controls[] = {
 			ALC5632_MIC_CTRL, 10, 3, 0, boost_tlv),
 	SOC_SINGLE_TLV("Mic 2 Boost Volume",
 			ALC5632_MIC_CTRL, 8, 3, 0, boost_tlv),
-	SOC_SINGLE_TLV("DMIC Boost Volume",
+	SOC_SINGLE_TLV("DMIC Boost Capture Volume",
 			ALC5632_DIGI_BOOST_CTRL, 0, 7, 0, dig_tlv),
 	SOC_SINGLE("DMIC En Capture Switch",
 			ALC5632_DIGI_BOOST_CTRL, 15, 1, 0),
-- 
1.7.3.4

  parent reply	other threads:[~2012-02-11 21:11 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-11 21:10 [PATCH 00/12] ASoC: ALC5632: Capture path improvements Leon Romanovsky
2012-02-11 21:10 ` [PATCH 01/12] ASoC: alc5632: Coding style. Remove two extra empty lines Leon Romanovsky
2012-02-11 21:10 ` [PATCH 02/12] ASoC: alc5632: Fixed voice DAC volume step Leon Romanovsky
2012-02-11 21:10 ` [PATCH 03/12] ASoC: alc5632: Add voice DAC playback switch Leon Romanovsky
2012-02-11 21:10 ` [PATCH 04/12] ASoC: alc5632: Rename capture switches to common scheme XXX2REC Leon Romanovsky
2012-02-11 21:10 ` [PATCH 05/12] ASoC: alc5632: Remove unexisting route from Phone Mix to Mono Mix Leon Romanovsky
2012-02-11 21:10 ` [PATCH 06/12] ASoC: alc5632: Refactored DAPM routes to add voice support Leon Romanovsky
2012-02-11 21:10 ` [PATCH 07/12] ASoC: alc5632: Add DMIC switches and controls Leon Romanovsky
2012-02-11 21:10 ` [PATCH 08/12] ASoC: alc5632: Fix I2S digital interface power for recording Leon Romanovsky
2012-02-11 21:10 ` [PATCH 09/12] ASoC: alc5632: Connect HP/HPL/HPR mix'es to HPOut Mix Leon Romanovsky
2012-02-11 21:10 ` [PATCH 10/12] ASoC: alc5632: Fix Boost Volume TLVs used for the external microphones Leon Romanovsky
2012-02-11 21:10 ` Leon Romanovsky [this message]
2012-02-11 21:10 ` [PATCH 12/12] ASoC: alc5632: Allow 8kHz stream support Leon Romanovsky

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=1328994645-8237-12-git-send-email-leon@leon.nu \
    --to=leon@leon.nu \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=fercerpav@gmail.com \
    --cc=lrg@ti.com \
    /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).