From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: alsa-devel@alsa-project.org, Sonic Zhang <sonic.zhang@analog.com>
Cc: Marcus Weigelt <marcus.weigelt@fwd-online.de>
Subject: [PATCH 2/6] ASoC: ad1980: fix names of a few kcontrols
Date: Tue, 24 Aug 2010 15:09:40 +0200 [thread overview]
Message-ID: <1282655384-13357-2-git-send-email-u.kleine-koenig@pengutronix.de> (raw)
In-Reply-To: <1282655384-13357-1-git-send-email-u.kleine-koenig@pengutronix.de>
From: Marcus Weigelt <marcus.weigelt@fwd-online.de>
The names used before keep alsamixer from showing the appropriate
controls for the AD1980. Mic and phone volume controls were shown in
alsamixers' capture tab where they don´t belong to. Phone playback
volume did not appear in playback tab and the microphone playback could
never be unmuted. Further it was not possible to select phone as
capture source. Changing the names fixes these problems.
Signed-off-by: Marcus Weigelt <marcus.weigelt@fwd-online.de>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
sound/soc/codecs/ad1980.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c
index 35c0580..c1550b8 100644
--- a/sound/soc/codecs/ad1980.c
+++ b/sound/soc/codecs/ad1980.c
@@ -82,11 +82,11 @@ SOC_SINGLE("PCM Capture Switch", AC97_REC_GAIN, 15, 1, 1),
SOC_SINGLE("Mono Playback Volume", AC97_MASTER_MONO, 0, 31, 1),
SOC_SINGLE("Mono Playback Switch", AC97_MASTER_MONO, 15, 1, 1),
-SOC_SINGLE("Phone Capture Volume", AC97_PHONE, 0, 31, 1),
-SOC_SINGLE("Phone Capture Switch", AC97_PHONE, 15, 1, 1),
+SOC_SINGLE("Phone Playback Volume", AC97_PHONE, 0, 31, 1),
+SOC_SINGLE("Phone Playback Switch", AC97_PHONE, 15, 1, 1),
-SOC_SINGLE("Mic Volume", AC97_MIC, 0, 31, 1),
-SOC_SINGLE("Mic Switch", AC97_MIC, 15, 1, 1),
+SOC_SINGLE("Mic Playback Volume", AC97_MIC, 0, 31, 1),
+SOC_SINGLE("Mic Playback Switch", AC97_MIC, 15, 1, 1),
SOC_SINGLE("Stereo Mic Switch", AC97_AD_MISC, 6, 1, 0),
SOC_DOUBLE("Line HP Swap Switch", AC97_AD_MISC, 10, 5, 1, 0),
--
1.7.1
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2010-08-24 13:09 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-24 13:09 [PATCH 1/6] ASoC: ad1980: Stay in 20bit mode for architectures other than blackfin Uwe Kleine-König
2010-08-24 13:09 ` Uwe Kleine-König [this message]
2010-08-27 18:11 ` [PATCH 2/6] ASoC: ad1980: fix names of a few kcontrols Mark Brown
2010-08-24 13:09 ` [PATCH 3/6] ASoC: ad1980: remove unneeded function declaration Uwe Kleine-König
2010-08-27 18:12 ` Mark Brown
2010-08-28 8:14 ` Liam Girdwood
2010-08-29 13:53 ` Mark Brown
2010-08-24 13:09 ` [PATCH 4/6] ASoC: ad1980: make usage of register cache optional Uwe Kleine-König
2010-08-27 18:20 ` Mark Brown
2010-08-24 13:09 ` [PATCH 5/6] ASoC: ad1980: verify cache at probe time Uwe Kleine-König
2010-08-27 18:23 ` Mark Brown
2010-08-24 13:09 ` [PATCH 6/6] ASoC: ad1980: verify writes Uwe Kleine-König
2010-08-27 18:25 ` Mark Brown
2010-08-25 3:28 ` [PATCH 1/6] ASoC: ad1980: Stay in 20bit mode for architectures other than blackfin Zhang, Sonic
2010-08-25 5:03 ` Uwe Kleine-König
2010-08-27 18:06 ` Mark Brown
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=1282655384-13357-2-git-send-email-u.kleine-koenig@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=alsa-devel@alsa-project.org \
--cc=marcus.weigelt@fwd-online.de \
--cc=sonic.zhang@analog.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.