Skip to content

Commit

Permalink
ALSA: hda/cs8409: Unmute/Mute codec when stream starts/stops
Browse files Browse the repository at this point in the history 
Codec is muted on init, and then unmuted when the stream starts.

Signed-off-by: Stefan Binding <[email protected]>
Signed-off-by: Vitaly Rodionov <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
@tiwai
Stefan Binding authored and tiwai committed Aug 12, 2021
1 parent 4ff2ae3 commit 7482ec7
Show file tree
Hide file tree
Showing 3 changed files with 120 additions and 30 deletions.
20 changes: 10 additions & 10 deletions sound/pci/hda/patch_cs8409-tables.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ static const struct cs8409_i2c_param cs42l42_init_reg_seq[] = {
{ 0x1010, 0xB0 },
{ 0x1D01, 0x00 },
{ 0x1D02, 0x06 },
{ 0x1D03, 0x00 },
{ 0x1D03, 0x9F },
{ 0x1107, 0x01 },
{ 0x1009, 0x02 },
{ 0x1007, 0x03 },
Expand Down Expand Up @@ -111,8 +111,8 @@ static const struct cs8409_i2c_param cs42l42_init_reg_seq[] = {
{ 0x2901, 0x01 },
{ 0x1101, 0x0A },
{ 0x1102, 0x84 },
{ 0x2301, 0x00 },
{ 0x2303, 0x00 },
{ 0x2301, 0x3F },
{ 0x2303, 0x3F },
{ 0x2302, 0x3f },
{ 0x2001, 0x03 },
{ 0x1B75, 0xB6 },
Expand Down Expand Up @@ -284,7 +284,7 @@ static const struct cs8409_i2c_param dolphin_c0_init_reg_seq[] = {
{ 0x1010, 0xB0 },
{ 0x1D01, 0x00 },
{ 0x1D02, 0x06 },
{ 0x1D03, 0x00 },
{ 0x1D03, 0x9F },
{ 0x1107, 0x01 },
{ 0x1009, 0x02 },
{ 0x1007, 0x03 },
Expand All @@ -309,8 +309,8 @@ static const struct cs8409_i2c_param dolphin_c0_init_reg_seq[] = {
{ 0x1101, 0x0A },
{ 0x1102, 0x84 },
{ 0x2001, 0x03 },
{ 0x2301, 0x00 },
{ 0x2303, 0x00 },
{ 0x2301, 0x3F },
{ 0x2303, 0x3F },
{ 0x2302, 0x3f },
{ 0x1B75, 0xB6 },
{ 0x1B73, 0xC2 },
Expand Down Expand Up @@ -340,7 +340,7 @@ static const struct cs8409_i2c_param dolphin_c1_init_reg_seq[] = {
{ 0x1010, 0xB0 },
{ 0x1D01, 0x00 },
{ 0x1D02, 0x06 },
{ 0x1D03, 0x00 },
{ 0x1D03, 0x9F },
{ 0x1107, 0x01 },
{ 0x1009, 0x02 },
{ 0x1007, 0x03 },
Expand All @@ -365,8 +365,8 @@ static const struct cs8409_i2c_param dolphin_c1_init_reg_seq[] = {
{ 0x1101, 0x0E },
{ 0x1102, 0x84 },
{ 0x2001, 0x01 },
{ 0x2301, 0x00 },
{ 0x2303, 0x00 },
{ 0x2301, 0x3F },
{ 0x2303, 0x3F },
{ 0x2302, 0x3f },
{ 0x1B75, 0xB6 },
{ 0x1B73, 0xC2 },
Expand All @@ -377,7 +377,7 @@ static const struct cs8409_i2c_param dolphin_c1_init_reg_seq[] = {
{ 0x1112, 0x00 },
{ 0x1113, 0x80 },
{ 0x1C03, 0xC0 },
{ 0x1101, 0x02 },
{ 0x1101, 0x06 },
{ 0x1316, 0xff },
{ 0x1317, 0xff },
{ 0x1318, 0xff },
Expand Down
123 changes: 103 additions & 20 deletions sound/pci/hda/patch_cs8409.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,38 @@ int cs42l42_volume_get(struct snd_kcontrol *kctrl, struct snd_ctl_elem_value *uc
return 0;
}

static void cs42l42_mute(struct sub_codec *cs42l42, int vol_type,
unsigned int chs, bool mute)
{
if (mute) {
if (vol_type == CS42L42_VOL_DAC) {
if (chs & BIT(0))
cs8409_i2c_write(cs42l42, CS42L42_REG_HS_VOL_CHA, 0x3f);
if (chs & BIT(1))
cs8409_i2c_write(cs42l42, CS42L42_REG_HS_VOL_CHB, 0x3f);
} else if (vol_type == CS42L42_VOL_ADC) {
if (chs & BIT(0))
cs8409_i2c_write(cs42l42, CS42L42_REG_AMIC_VOL, 0x9f);
}
} else {
if (vol_type == CS42L42_VOL_DAC) {
if (chs & BIT(0))
cs8409_i2c_write(cs42l42, CS42L42_REG_HS_VOL_CHA,
-(cs42l42->vol[CS42L42_DAC_CH0_VOL_OFFSET])
& CS42L42_REG_HS_VOL_MASK);
if (chs & BIT(1))
cs8409_i2c_write(cs42l42, CS42L42_REG_HS_VOL_CHB,
-(cs42l42->vol[CS42L42_DAC_CH1_VOL_OFFSET])
& CS42L42_REG_HS_VOL_MASK);
} else if (vol_type == CS42L42_VOL_ADC) {
if (chs & BIT(0))
cs8409_i2c_write(cs42l42, CS42L42_REG_AMIC_VOL,
cs42l42->vol[CS42L42_ADC_VOL_OFFSET]
& CS42L42_REG_AMIC_VOL_MASK);
}
}
}

int cs42l42_volume_put(struct snd_kcontrol *kctrl, struct snd_ctl_elem_value *uctrl)
{
struct hda_codec *codec = snd_kcontrol_chip(kctrl);
Expand All @@ -486,25 +518,20 @@ int cs42l42_volume_put(struct snd_kcontrol *kctrl, struct snd_ctl_elem_value *uc

switch (ofs) {
case CS42L42_VOL_DAC:
if (chs & BIT(0)) {
if (chs & BIT(0))
cs42l42->vol[ofs] = *valp;
cs8409_i2c_write(cs42l42, CS42L42_REG_HS_VOL_CHA,
-(cs42l42->vol[ofs]) & CS42L42_REG_HS_VOL_MASK);
}
if (chs & BIT(1)) {
ofs++;
valp++;
cs42l42->vol[ofs] = *valp;
cs8409_i2c_write(cs42l42, CS42L42_REG_HS_VOL_CHB,
-(cs42l42->vol[ofs]) & CS42L42_REG_HS_VOL_MASK);
cs42l42->vol[ofs + 1] = *valp;
}
if (spec->playback_started)
cs42l42_mute(cs42l42, CS42L42_VOL_DAC, chs, false);
break;
case CS42L42_VOL_ADC:
if (chs & BIT(0)) {
if (chs & BIT(0))
cs42l42->vol[ofs] = *valp;
cs8409_i2c_write(cs42l42, CS42L42_REG_AMIC_VOL,
cs42l42->vol[ofs] & CS42L42_REG_AMIC_VOL_MASK);
}
if (spec->capture_started)
cs42l42_mute(cs42l42, CS42L42_VOL_ADC, chs, false);
break;
default:
break;
Expand All @@ -513,6 +540,64 @@ int cs42l42_volume_put(struct snd_kcontrol *kctrl, struct snd_ctl_elem_value *uc
return 0;
}

static void cs42l42_playback_pcm_hook(struct hda_pcm_stream *hinfo,
struct hda_codec *codec,
struct snd_pcm_substream *substream,
int action)
{
struct cs8409_spec *spec = codec->spec;
struct sub_codec *cs42l42;
int i;
bool mute;

switch (action) {
case HDA_GEN_PCM_ACT_PREPARE:
mute = false;
spec->playback_started = 1;
break;
case HDA_GEN_PCM_ACT_CLEANUP:
mute = true;
spec->playback_started = 0;
break;
default:
return;
}

for (i = 0; i < spec->num_scodecs; i++) {
cs42l42 = spec->scodecs[i];
cs42l42_mute(cs42l42, CS42L42_VOL_DAC, 0x3, mute);
}
}

static void cs42l42_capture_pcm_hook(struct hda_pcm_stream *hinfo,
struct hda_codec *codec,
struct snd_pcm_substream *substream,
int action)
{
struct cs8409_spec *spec = codec->spec;
struct sub_codec *cs42l42;
int i;
bool mute;

switch (action) {
case HDA_GEN_PCM_ACT_PREPARE:
mute = false;
spec->capture_started = 1;
break;
case HDA_GEN_PCM_ACT_CLEANUP:
mute = true;
spec->capture_started = 0;
break;
default:
return;
}

for (i = 0; i < spec->num_scodecs; i++) {
cs42l42 = spec->scodecs[i];
cs42l42_mute(cs42l42, CS42L42_VOL_ADC, 0x3, mute);
}
}

/* Configure CS42L42 slave codec for jack autodetect */
static void cs42l42_enable_jack_detect(struct sub_codec *cs42l42)
{
Expand Down Expand Up @@ -658,14 +743,6 @@ static void cs42l42_resume(struct sub_codec *cs42l42)
/* Clear interrupts, by reading interrupt status registers */
cs8409_i2c_bulk_read(cs42l42, irq_regs, ARRAY_SIZE(irq_regs));

/* Restore Volumes after Resume */
cs8409_i2c_write(cs42l42, CS42L42_REG_HS_VOL_CHA,
-(cs42l42->vol[1]) & CS42L42_REG_HS_VOL_MASK);
cs8409_i2c_write(cs42l42, CS42L42_REG_HS_VOL_CHB,
-(cs42l42->vol[2]) & CS42L42_REG_HS_VOL_MASK);
cs8409_i2c_write(cs42l42, CS42L42_REG_AMIC_VOL,
cs42l42->vol[0] & CS42L42_REG_AMIC_VOL_MASK);

if (cs42l42->full_scale_vol)
cs8409_i2c_write(cs42l42, 0x2001, 0x01);

Expand Down Expand Up @@ -925,6 +1002,9 @@ void cs8409_cs42l42_fixups(struct hda_codec *codec, const struct hda_fixup *fix,
/* Fix Sample Rate to 48kHz */
spec->gen.stream_analog_playback = &cs42l42_48k_pcm_analog_playback;
spec->gen.stream_analog_capture = &cs42l42_48k_pcm_analog_capture;
/* add hooks */
spec->gen.pcm_playback_hook = cs42l42_playback_pcm_hook;
spec->gen.pcm_capture_hook = cs42l42_capture_pcm_hook;
/* Set initial DMIC volume to -26 dB */
snd_hda_codec_amp_init_stereo(codec, CS8409_CS42L42_DMIC_ADC_PIN_NID,
HDA_INPUT, 0, 0xff, 0x19);
Expand Down Expand Up @@ -1120,6 +1200,9 @@ void dolphin_fixups(struct hda_codec *codec, const struct hda_fixup *fix, int ac
/* Fix Sample Rate to 48kHz */
spec->gen.stream_analog_playback = &cs42l42_48k_pcm_analog_playback;
spec->gen.stream_analog_capture = &cs42l42_48k_pcm_analog_capture;
/* add hooks */
spec->gen.pcm_playback_hook = cs42l42_playback_pcm_hook;
spec->gen.pcm_capture_hook = cs42l42_capture_pcm_hook;
snd_hda_gen_add_kctl(&spec->gen, "Headphone Playback Volume",
&cs42l42_dac_volume_mixer);
snd_hda_gen_add_kctl(&spec->gen, "Mic Capture Volume", &cs42l42_adc_volume_mixer);
Expand Down
7 changes: 7 additions & 0 deletions sound/pci/hda/patch_cs8409.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,10 @@ enum {
CS42L42_VOL_DAC,
};

#define CS42L42_ADC_VOL_OFFSET (CS42L42_VOL_ADC)
#define CS42L42_DAC_CH0_VOL_OFFSET (CS42L42_VOL_DAC)
#define CS42L42_DAC_CH1_VOL_OFFSET (CS42L42_VOL_DAC + 1)

struct cs8409_i2c_param {
unsigned int addr;
unsigned int value;
Expand Down Expand Up @@ -327,6 +331,9 @@ struct cs8409_spec {
unsigned int dev_addr;
struct delayed_work i2c_clk_work;

unsigned int playback_started:1;
unsigned int capture_started:1;

/* verb exec op override */
int (*exec_verb)(struct hdac_device *dev, unsigned int cmd, unsigned int flags,
unsigned int *res);
Expand Down

0 comments on commit 7482ec7

Please sign in to comment.