From: Lucas Stach <l.stach@pengutronix.de>
To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>
Cc: alsa-devel@alsa-project.org, kernel@pengutronix.de,
patchwork-lst@pengutronix.de
Subject: [PATCH] ASoC: tpa61xx: add back chip name to the controls
Date: Tue, 17 Oct 2017 11:57:29 +0200 [thread overview]
Message-ID: <20171017095729.6032-1-l.stach@pengutronix.de> (raw)
Commit cb7e62256e99( ASoC: tpa6130a2: Register component) removed the chip
name from the controls, which causes issues as the TPA61xx is not a
standalone codec, but a headphone amplifier, which may be connected to the
line out of a codec which already exposes a "Headphone Playback Volume"
control. In that case we end up with duplicate controls, causing the
the probe of the soundcard to be aborted.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
sound/soc/codecs/tpa6130a2.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c
index 2e014c80d113..abca7eedb6be 100644
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -136,7 +136,7 @@ static const DECLARE_TLV_DB_RANGE(tpa6130_tlv,
);
static const struct snd_kcontrol_new tpa6130a2_controls[] = {
- SOC_SINGLE_TLV("Headphone Playback Volume",
+ SOC_SINGLE_TLV("TPA6130A2 Headphone Playback Volume",
TPA6130A2_REG_VOL_MUTE, 0, 0x3f, 0,
tpa6130_tlv),
};
@@ -148,7 +148,7 @@ static const DECLARE_TLV_DB_RANGE(tpa6140_tlv,
);
static const struct snd_kcontrol_new tpa6140a2_controls[] = {
- SOC_SINGLE_TLV("Headphone Playback Volume",
+ SOC_SINGLE_TLV("TPA6140A2 Headphone Playback Volume",
TPA6130A2_REG_VOL_MUTE, 1, 0x1f, 0,
tpa6140_tlv),
};
--
2.11.0
next reply other threads:[~2017-10-17 9:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-17 9:57 Lucas Stach [this message]
2017-10-17 10:14 ` [PATCH] ASoC: tpa61xx: add back chip name to the controls Mark Brown
2017-10-17 10:59 ` Lucas Stach
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=20171017095729.6032-1-l.stach@pengutronix.de \
--to=l.stach@pengutronix.de \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=kernel@pengutronix.de \
--cc=lgirdwood@gmail.com \
--cc=patchwork-lst@pengutronix.de \
/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).