system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-09 21:05:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: rt711-sdca: change capture switch controls

Browse source 
The DAPM event and mixer control could mute/unmute the capture directly.
That will be confused that capture still works if the user settings is unmute before the capture.
Therefore, this patch uses the variables to record the capture switch status of DAPM and mixer.

Signed-off-by: Shuming Fan <shumingf@realtek.com>
Link: https://lore.kernel.org/r/20210422103220.21987-1-shumingf@realtek.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Shuming Fan 2021-04-22 18:32:20 +08:00 committed by Mark Brown
parent 12f8127fe9
commit ca5118c0c0
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
2 changed files with 127 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

168
sound/soc/codecs/rt711-sdca.c
View file

@ -642,6 +642,114 @@ static int rt711_sdca_set_gain_get(struct snd_kcontrol *kcontrol,
return 0; return 0;
} }
static int rt711_sdca_set_fu0f_capture_ctl(struct rt711_sdca_priv *rt711)
{
int err;
unsigned int ch_l, ch_r;
ch_l = (rt711->fu0f_dapm_mute || rt711->fu0f_mixer_l_mute) ? 0x01 : 0x00;
ch_r = (rt711->fu0f_dapm_mute || rt711->fu0f_mixer_r_mute) ? 0x01 : 0x00;
err = regmap_write(rt711->regmap,
SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT711_SDCA_ENT_USER_FU0F,
RT711_SDCA_CTL_FU_MUTE, CH_L), ch_l);
if (err < 0)
return err;
err = regmap_write(rt711->regmap,
SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT711_SDCA_ENT_USER_FU0F,
RT711_SDCA_CTL_FU_MUTE, CH_R), ch_r);
if (err < 0)
return err;
return 0;
}
static int rt711_sdca_set_fu1e_capture_ctl(struct rt711_sdca_priv *rt711)
{
int err;
unsigned int ch_l, ch_r;
ch_l = (rt711->fu1e_dapm_mute || rt711->fu1e_mixer_l_mute) ? 0x01 : 0x00;
ch_r = (rt711->fu1e_dapm_mute || rt711->fu1e_mixer_r_mute) ? 0x01 : 0x00;
err = regmap_write(rt711->regmap,
SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT711_SDCA_ENT_USER_FU1E,
RT711_SDCA_CTL_FU_MUTE, CH_L), ch_l);
if (err < 0)
return err;
err = regmap_write(rt711->regmap,
SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT711_SDCA_ENT_USER_FU1E,
RT711_SDCA_CTL_FU_MUTE, CH_R), ch_r);
if (err < 0)
return err;
return 0;
}
static int rt711_sdca_fu1e_capture_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
struct rt711_sdca_priv *rt711 = snd_soc_component_get_drvdata(component);
ucontrol->value.integer.value[0] = !rt711->fu1e_mixer_l_mute;
ucontrol->value.integer.value[1] = !rt711->fu1e_mixer_r_mute;
return 0;
}
static int rt711_sdca_fu1e_capture_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
struct rt711_sdca_priv *rt711 = snd_soc_component_get_drvdata(component);
int err, changed = 0;
if (rt711->fu1e_mixer_l_mute != !ucontrol->value.integer.value[0] ||
rt711->fu1e_mixer_r_mute != !ucontrol->value.integer.value[1])
changed = 1;
rt711->fu1e_mixer_l_mute = !ucontrol->value.integer.value[0];
rt711->fu1e_mixer_r_mute = !ucontrol->value.integer.value[1];
err = rt711_sdca_set_fu1e_capture_ctl(rt711);
if (err < 0)
return err;
return changed;
}
static int rt711_sdca_fu0f_capture_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
struct rt711_sdca_priv *rt711 = snd_soc_component_get_drvdata(component);
ucontrol->value.integer.value[0] = !rt711->fu0f_mixer_l_mute;
ucontrol->value.integer.value[1] = !rt711->fu0f_mixer_r_mute;
return 0;
}
static int rt711_sdca_fu0f_capture_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
struct rt711_sdca_priv *rt711 = snd_soc_component_get_drvdata(component);
int err, changed = 0;
if (rt711->fu0f_mixer_l_mute != !ucontrol->value.integer.value[0] ||
rt711->fu0f_mixer_r_mute != !ucontrol->value.integer.value[1])
changed = 1;
rt711->fu0f_mixer_l_mute = !ucontrol->value.integer.value[0];
rt711->fu0f_mixer_r_mute = !ucontrol->value.integer.value[1];
err = rt711_sdca_set_fu0f_capture_ctl(rt711);
if (err < 0)
return err;
return changed;
}
static const DECLARE_TLV_DB_SCALE(out_vol_tlv, -6525, 75, 0); static const DECLARE_TLV_DB_SCALE(out_vol_tlv, -6525, 75, 0);
static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -1725, 75, 0); static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -1725, 75, 0);
static const DECLARE_TLV_DB_SCALE(mic_vol_tlv, 0, 1000, 0); static const DECLARE_TLV_DB_SCALE(mic_vol_tlv, 0, 1000, 0);
@ -652,14 +760,10 @@ static const struct snd_kcontrol_new rt711_sdca_snd_controls[] = {
SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT711_SDCA_ENT_USER_FU05, RT711_SDCA_CTL_FU_VOLUME, CH_R), SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT711_SDCA_ENT_USER_FU05, RT711_SDCA_CTL_FU_VOLUME, CH_R),
0x57, 0x57, 0, 0x57, 0x57, 0,
rt711_sdca_set_gain_get, rt711_sdca_set_gain_put, out_vol_tlv), rt711_sdca_set_gain_get, rt711_sdca_set_gain_put, out_vol_tlv),
SOC_DOUBLE_R("FU1E Capture Switch", SOC_DOUBLE_EXT("FU1E Capture Switch", SND_SOC_NOPM, 0, 1, 1, 0,
SDW_SDCA_CTL(FUNC_NUM_MIC_ARRAY, RT711_SDCA_ENT_USER_FU1E, RT711_SDCA_CTL_FU_MUTE, CH_L), rt711_sdca_fu1e_capture_get, rt711_sdca_fu1e_capture_put),
SDW_SDCA_CTL(FUNC_NUM_MIC_ARRAY, RT711_SDCA_ENT_USER_FU1E, RT711_SDCA_CTL_FU_MUTE, CH_R), SOC_DOUBLE_EXT("FU0F Capture Switch", SND_SOC_NOPM, 0, 1, 1, 0,
0, 1, 1), rt711_sdca_fu0f_capture_get, rt711_sdca_fu0f_capture_put),
SOC_DOUBLE_R("FU0F Capture Switch",
SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT711_SDCA_ENT_USER_FU0F, RT711_SDCA_CTL_FU_MUTE, CH_L),
SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT711_SDCA_ENT_USER_FU0F, RT711_SDCA_CTL_FU_MUTE, CH_R),
0, 1, 1),
SOC_DOUBLE_R_EXT_TLV("FU1E Capture Volume", SOC_DOUBLE_R_EXT_TLV("FU1E Capture Volume",
SDW_SDCA_CTL(FUNC_NUM_MIC_ARRAY, RT711_SDCA_ENT_USER_FU1E, RT711_SDCA_CTL_FU_VOLUME, CH_L), SDW_SDCA_CTL(FUNC_NUM_MIC_ARRAY, RT711_SDCA_ENT_USER_FU1E, RT711_SDCA_CTL_FU_VOLUME, CH_L),
SDW_SDCA_CTL(FUNC_NUM_MIC_ARRAY, RT711_SDCA_ENT_USER_FU1E, RT711_SDCA_CTL_FU_VOLUME, CH_R), SDW_SDCA_CTL(FUNC_NUM_MIC_ARRAY, RT711_SDCA_ENT_USER_FU1E, RT711_SDCA_CTL_FU_VOLUME, CH_R),
@ -809,28 +913,15 @@ static int rt711_sdca_fu0f_event(struct snd_soc_dapm_widget *w,
struct snd_soc_component *component = struct snd_soc_component *component =
snd_soc_dapm_to_component(w->dapm); snd_soc_dapm_to_component(w->dapm);
struct rt711_sdca_priv *rt711 = snd_soc_component_get_drvdata(component); struct rt711_sdca_priv *rt711 = snd_soc_component_get_drvdata(component);
unsigned char unmute = 0x0, mute = 0x1;
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
regmap_write(rt711->regmap, rt711->fu0f_dapm_mute = false;
SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT711_SDCA_ENT_USER_FU0F, rt711_sdca_set_fu0f_capture_ctl(rt711);
RT711_SDCA_CTL_FU_MUTE, CH_L),
unmute);
regmap_write(rt711->regmap,
SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT711_SDCA_ENT_USER_FU0F,
RT711_SDCA_CTL_FU_MUTE, CH_R),
unmute);
break; break;
case SND_SOC_DAPM_PRE_PMD: case SND_SOC_DAPM_PRE_PMD:
regmap_write(rt711->regmap, rt711->fu0f_dapm_mute = true;
SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT711_SDCA_ENT_USER_FU0F, rt711_sdca_set_fu0f_capture_ctl(rt711);
RT711_SDCA_CTL_FU_MUTE, CH_L),
mute);
regmap_write(rt711->regmap,
SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT711_SDCA_ENT_USER_FU0F,
RT711_SDCA_CTL_FU_MUTE, CH_R),
mute);
break; break;
} }
return 0; return 0;
@ -842,29 +933,16 @@ static int rt711_sdca_fu1e_event(struct snd_soc_dapm_widget *w,
struct snd_soc_component *component = struct snd_soc_component *component =
snd_soc_dapm_to_component(w->dapm); snd_soc_dapm_to_component(w->dapm);
struct rt711_sdca_priv *rt711 = snd_soc_component_get_drvdata(component); struct rt711_sdca_priv *rt711 = snd_soc_component_get_drvdata(component);
unsigned char unmute = 0x0, mute = 0x1;
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
regmap_write(rt711->regmap, rt711->fu1e_dapm_mute = false;
SDW_SDCA_CTL(FUNC_NUM_MIC_ARRAY, RT711_SDCA_ENT_USER_FU1E, rt711_sdca_set_fu1e_capture_ctl(rt711);
RT711_SDCA_CTL_FU_MUTE, CH_L),
unmute);
regmap_write(rt711->regmap,
SDW_SDCA_CTL(FUNC_NUM_MIC_ARRAY, RT711_SDCA_ENT_USER_FU1E,
RT711_SDCA_CTL_FU_MUTE, CH_R),
unmute);
break; break;
case SND_SOC_DAPM_PRE_PMD: case SND_SOC_DAPM_PRE_PMD:
regmap_write(rt711->regmap, rt711->fu1e_dapm_mute = true;
SDW_SDCA_CTL(FUNC_NUM_MIC_ARRAY, RT711_SDCA_ENT_USER_FU1E, rt711_sdca_set_fu1e_capture_ctl(rt711);
RT711_SDCA_CTL_FU_MUTE, CH_L), break;
mute);
regmap_write(rt711->regmap,
SDW_SDCA_CTL(FUNC_NUM_MIC_ARRAY, RT711_SDCA_ENT_USER_FU1E,
RT711_SDCA_CTL_FU_MUTE, CH_R),
mute);
break;
} }
return 0; return 0;
} }
@ -1330,6 +1408,10 @@ int rt711_sdca_init(struct device *dev, struct regmap *regmap,
*/ */
rt711->hw_init = false; rt711->hw_init = false;
rt711->first_hw_init = false; rt711->first_hw_init = false;
rt711->fu0f_dapm_mute = true;
rt711->fu1e_dapm_mute = true;
rt711->fu0f_mixer_l_mute = rt711->fu0f_mixer_r_mute = true;
rt711->fu1e_mixer_l_mute = rt711->fu1e_mixer_r_mute = true;
/* JD source uses JD2 in default */ /* JD source uses JD2 in default */
rt711->jd_src = RT711_JD2; rt711->jd_src = RT711_JD2;

2
sound/soc/codecs/rt711-sdca.h
View file

@ -30,6 +30,8 @@ struct rt711_sdca_priv {
int jack_type, jd_src; int jack_type, jd_src;
unsigned int scp_sdca_stat1, scp_sdca_stat2; unsigned int scp_sdca_stat1, scp_sdca_stat2;
int hw_ver; int hw_ver;
bool fu0f_dapm_mute, fu0f_mixer_l_mute, fu0f_mixer_r_mute;
bool fu1e_dapm_mute, fu1e_mixer_l_mute, fu1e_mixer_r_mute;
}; };
struct sdw_stream_data { struct sdw_stream_data {