diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2017-10-16 14:40:42 +0200 |
|---|---|---|
| committer | Lucas Stach <l.stach@pengutronix.de> | 2017-10-18 19:26:46 +0200 |
| commit | 5d6bdc200a6dd84282437be0f18c82bb3f96c3c6 (patch) | |
| tree | 75b315764846a4cf53c5e35ae7bf70169048f548 | |
| parent | 9a6f0277342edfda539b0a12968664e35b1852e4 (diff) | |
| download | linux-5d6bdc200a6dd84282437be0f18c82bb3f96c3c6.tar.gz linux-5d6bdc200a6dd84282437be0f18c82bb3f96c3c6.tar.xz | |
ASoC: tpa61xx: add back chip name to the controls
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>
| -rw-r--r-- | sound/soc/codecs/tpa6130a2.c | 4 |
1 files 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), }; |