Skip to content

Commit eae0946

Browse files
Christophe Leroy (CS GROUP)broonie
authored andcommitted
ASoC: codecs: peb2466: Change the +/- 6dB switch to a volume
In addition to the digital volume adjustment, infineon peb2466 codec has an analog adjustment which can be set to either 0dB or +/-6dB. At the time being it is defined as a switch and appears in 'alsamixer' like a 'mute'. This adjustment isn't a mute, change it to a 'volume' with an associated dB range. With this change, this adjustment now appears in 'alsamixer' as a standard volume slider which can have two positions. Signed-off-by: Christophe Leroy (CS GROUP) <chleroy@kernel.org> Acked-by: Herve Codina <herve.codina@bootlin.com> Link: https://patch.msgid.link/418fe76d1c9efc8182ab57b6b426a8c723e025fe.1773056714.git.chleroy@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 66f71ec commit eae0946

1 file changed

Lines changed: 11 additions & 8 deletions

File tree

sound/soc/codecs/peb2466.c

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -517,18 +517,21 @@ static const struct snd_kcontrol_new peb2466_ch3_out_mix_controls[] = {
517517
SOC_DAPM_SINGLE("Voice Switch", PEB2466_CR2(3), 0, 1, 0)
518518
};
519519

520+
static const SNDRV_CTL_TLVD_DECLARE_DB_MINMAX(peb2466_gain_p_tlv, -600, 0);
521+
static const SNDRV_CTL_TLVD_DECLARE_DB_MINMAX(peb2466_gain_c_tlv, 0, 600);
522+
520523
static const struct snd_kcontrol_new peb2466_controls[] = {
521524
/* Attenuators */
522-
SOC_SINGLE("DAC0 -6dB Playback Switch", PEB2466_CR3(0), 2, 1, 0),
523-
SOC_SINGLE("DAC1 -6dB Playback Switch", PEB2466_CR3(1), 2, 1, 0),
524-
SOC_SINGLE("DAC2 -6dB Playback Switch", PEB2466_CR3(2), 2, 1, 0),
525-
SOC_SINGLE("DAC3 -6dB Playback Switch", PEB2466_CR3(3), 2, 1, 0),
525+
SOC_SINGLE_TLV("DAC0 -6dB Playback Volume", PEB2466_CR3(0), 2, 1, 1, peb2466_gain_p_tlv),
526+
SOC_SINGLE_TLV("DAC1 -6dB Playback Volume", PEB2466_CR3(1), 2, 1, 1, peb2466_gain_p_tlv),
527+
SOC_SINGLE_TLV("DAC2 -6dB Playback Volume", PEB2466_CR3(2), 2, 1, 1, peb2466_gain_p_tlv),
528+
SOC_SINGLE_TLV("DAC3 -6dB Playback Volume", PEB2466_CR3(3), 2, 1, 1, peb2466_gain_p_tlv),
526529

527530
/* Amplifiers */
528-
SOC_SINGLE("ADC0 +6dB Capture Switch", PEB2466_CR3(0), 3, 1, 0),
529-
SOC_SINGLE("ADC1 +6dB Capture Switch", PEB2466_CR3(1), 3, 1, 0),
530-
SOC_SINGLE("ADC2 +6dB Capture Switch", PEB2466_CR3(2), 3, 1, 0),
531-
SOC_SINGLE("ADC3 +6dB Capture Switch", PEB2466_CR3(3), 3, 1, 0),
531+
SOC_SINGLE_TLV("ADC0 +6dB Capture Volume", PEB2466_CR3(0), 3, 1, 0, peb2466_gain_c_tlv),
532+
SOC_SINGLE_TLV("ADC1 +6dB Capture Volume", PEB2466_CR3(1), 3, 1, 0, peb2466_gain_c_tlv),
533+
SOC_SINGLE_TLV("ADC2 +6dB Capture Volume", PEB2466_CR3(2), 3, 1, 0, peb2466_gain_c_tlv),
534+
SOC_SINGLE_TLV("ADC3 +6dB Capture Volume", PEB2466_CR3(3), 3, 1, 0, peb2466_gain_c_tlv),
532535

533536
/* Tone generators */
534537
SOC_ENUM_EXT("DAC0 TG1 Freq", peb2466_tg_freq[0][0],

0 commit comments

Comments
 (0)