mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-15 00:04:15 +08:00
ALSA: hda/tas2781: remove digital gain kcontrol
The "Speaker Digital Gain" kcontrol controls the TAS2781_DVC_LVL (0x1A) register. Unfortunately the tas2563 does not have DVC_LVL, but has INT_MASK0 in 0x1A, which has been misused so far. Since commitc1947ce61f
("ALSA: hda/realtek: tas2781: enable subwoofer volume control") the volume of the tas2781 amplifiers can be controlled by the master volume, so this digital gain kcontrol is not needed. Remove it. Fixes:5be27f1e3e
("ALSA: hda/tas2781: Add tas2781 HDA driver") CC: stable@vger.kernel.org Signed-off-by: Gergo Koteles <soyer@irl.hu> Message-ID: <741fc21db994efd58f83e7aef38931204961e5b2.1711469583.git.soyer@irl.hu> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
7590ac2249
commit
ae065d0ce9
@ -89,7 +89,7 @@ struct tas2781_hda {
|
||||
struct snd_kcontrol *dsp_prog_ctl;
|
||||
struct snd_kcontrol *dsp_conf_ctl;
|
||||
struct snd_kcontrol *prof_ctl;
|
||||
struct snd_kcontrol *snd_ctls[3];
|
||||
struct snd_kcontrol *snd_ctls[2];
|
||||
};
|
||||
|
||||
static int tas2781_get_i2c_res(struct acpi_resource *ares, void *data)
|
||||
@ -294,27 +294,6 @@ static int tasdevice_config_put(struct snd_kcontrol *kcontrol,
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* tas2781_digital_getvol - get the volum control
|
||||
* @kcontrol: control pointer
|
||||
* @ucontrol: User data
|
||||
* Customer Kcontrol for tas2781 is primarily for regmap booking, paging
|
||||
* depends on internal regmap mechanism.
|
||||
* tas2781 contains book and page two-level register map, especially
|
||||
* book switching will set the register BXXP00R7F, after switching to the
|
||||
* correct book, then leverage the mechanism for paging to access the
|
||||
* register.
|
||||
*/
|
||||
static int tas2781_digital_getvol(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
struct tasdevice_priv *tas_priv = snd_kcontrol_chip(kcontrol);
|
||||
struct soc_mixer_control *mc =
|
||||
(struct soc_mixer_control *)kcontrol->private_value;
|
||||
|
||||
return tasdevice_digital_getvol(tas_priv, ucontrol, mc);
|
||||
}
|
||||
|
||||
static int tas2781_amp_getvol(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
@ -325,17 +304,6 @@ static int tas2781_amp_getvol(struct snd_kcontrol *kcontrol,
|
||||
return tasdevice_amp_getvol(tas_priv, ucontrol, mc);
|
||||
}
|
||||
|
||||
static int tas2781_digital_putvol(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
struct tasdevice_priv *tas_priv = snd_kcontrol_chip(kcontrol);
|
||||
struct soc_mixer_control *mc =
|
||||
(struct soc_mixer_control *)kcontrol->private_value;
|
||||
|
||||
/* The check of the given value is in tasdevice_digital_putvol. */
|
||||
return tasdevice_digital_putvol(tas_priv, ucontrol, mc);
|
||||
}
|
||||
|
||||
static int tas2781_amp_putvol(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
@ -381,9 +349,6 @@ static const struct snd_kcontrol_new tas2781_snd_controls[] = {
|
||||
ACARD_SINGLE_RANGE_EXT_TLV("Speaker Analog Gain", TAS2781_AMP_LEVEL,
|
||||
1, 0, 20, 0, tas2781_amp_getvol,
|
||||
tas2781_amp_putvol, amp_vol_tlv),
|
||||
ACARD_SINGLE_RANGE_EXT_TLV("Speaker Digital Gain", TAS2781_DVC_LVL,
|
||||
0, 0, 200, 1, tas2781_digital_getvol,
|
||||
tas2781_digital_putvol, dvc_tlv),
|
||||
ACARD_SINGLE_BOOL_EXT("Speaker Force Firmware Load", 0,
|
||||
tas2781_force_fwload_get, tas2781_force_fwload_put),
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user