Skip to content

Commit 4f89186

Browse files
jhovoldgregkh
authored andcommitted
ASoC: codecs: wsa883x: fix PA volume control
commit b53cc61 upstream. The PA gain can be set in steps of 1.5 dB from -3 dB to 18 dB, that is, in 15 levels. Fix the dB values for the PA volume control as experiments using wsa8835 show that the first 16 levels all map to the same lowest gain while the last three map to the highest gain. These values specifically need to be correct for the sound server to provide proper volume control. Note that level 0 (-3 dB) does not mute the PA so the mute flag should also not be set. Fixes: cdb09e6 ("ASoC: codecs: wsa883x: add control, dapm widgets and map") Cc: stable@vger.kernel.org # 6.0 Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Link: https://msgid.link/r/20240119112420.7446-2-johan+linaro@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent a499a67 commit 4f89186

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

sound/soc/codecs/wsa883x.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1098,7 +1098,11 @@ static int wsa_dev_mode_put(struct snd_kcontrol *kcontrol,
10981098
return 1;
10991099
}
11001100

1101-
static const DECLARE_TLV_DB_SCALE(pa_gain, -300, 150, -300);
1101+
static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(pa_gain,
1102+
0, 14, TLV_DB_SCALE_ITEM(-300, 0, 0),
1103+
15, 29, TLV_DB_SCALE_ITEM(-300, 150, 0),
1104+
30, 31, TLV_DB_SCALE_ITEM(1800, 0, 0),
1105+
);
11021106

11031107
static int wsa883x_get_swr_port(struct snd_kcontrol *kcontrol,
11041108
struct snd_ctl_elem_value *ucontrol)

0 commit comments

Comments
 (0)