ALSA: hda - Replace ALC269 quanta and lifebook models with fixups
Implement new fixup entries for Quanta FL1 and Fujitsu Lifebook specific COEF and pin configurations. Removed the model entries from alc269_quirks.c. Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
d62f50dc7c
commit
2451991167
|
@ -68,10 +68,8 @@ ALC267/268
|
|||
ALC269
|
||||
======
|
||||
basic Basic preset
|
||||
quanta Quanta FL1
|
||||
laptop-amic Laptops with analog-mic input
|
||||
laptop-dmic Laptops with digital-mic input
|
||||
lifebook Fujitsu Lifebook S6420
|
||||
auto auto-config reading BIOS (default)
|
||||
|
||||
ALC662/663/272
|
||||
|
|
|
@ -12,7 +12,6 @@ enum {
|
|||
ALC269_DMIC,
|
||||
ALC269VB_AMIC,
|
||||
ALC269VB_DMIC,
|
||||
ALC269_LIFEBOOK,
|
||||
ALC269_MODEL_LAST /* last tag */
|
||||
};
|
||||
|
||||
|
@ -60,65 +59,6 @@ static const struct snd_kcontrol_new alc269_base_mixer[] = {
|
|||
{ } /* end */
|
||||
};
|
||||
|
||||
/* Acer specific */
|
||||
/* bind volumes of both NID 0x02 and 0x03 */
|
||||
static const struct hda_bind_ctls alc268_acer_bind_master_vol = {
|
||||
.ops = &snd_hda_bind_vol,
|
||||
.values = {
|
||||
HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
|
||||
HDA_COMPOSE_AMP_VAL(0x03, 3, 0, HDA_OUTPUT),
|
||||
0
|
||||
},
|
||||
};
|
||||
|
||||
#define alc268_acer_master_sw_get alc262_hp_master_sw_get
|
||||
#define alc268_acer_master_sw_put alc262_hp_master_sw_put
|
||||
|
||||
static const struct snd_kcontrol_new alc269_quanta_fl1_mixer[] = {
|
||||
/* output mixer control */
|
||||
HDA_BIND_VOL("Master Playback Volume", &alc268_acer_bind_master_vol),
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Master Playback Switch",
|
||||
.subdevice = HDA_SUBDEV_AMP_FLAG,
|
||||
.info = snd_hda_mixer_amp_switch_info,
|
||||
.get = snd_hda_mixer_amp_switch_get,
|
||||
.put = alc268_acer_master_sw_put,
|
||||
.private_value = HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
|
||||
},
|
||||
HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x19, 0, HDA_INPUT),
|
||||
{ }
|
||||
};
|
||||
|
||||
static const struct snd_kcontrol_new alc269_lifebook_mixer[] = {
|
||||
/* output mixer control */
|
||||
HDA_BIND_VOL("Master Playback Volume", &alc268_acer_bind_master_vol),
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Master Playback Switch",
|
||||
.subdevice = HDA_SUBDEV_AMP_FLAG,
|
||||
.info = snd_hda_mixer_amp_switch_info,
|
||||
.get = snd_hda_mixer_amp_switch_get,
|
||||
.put = alc268_acer_master_sw_put,
|
||||
.private_value = HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
|
||||
},
|
||||
HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x19, 0, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Dock Mic Playback Volume", 0x0b, 0x03, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Dock Mic Playback Switch", 0x0b, 0x03, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Dock Mic Boost Volume", 0x1b, 0, HDA_INPUT),
|
||||
{ }
|
||||
};
|
||||
|
||||
static const struct snd_kcontrol_new alc269_laptop_mixer[] = {
|
||||
HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
|
||||
HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),
|
||||
|
@ -172,127 +112,6 @@ static const struct snd_kcontrol_new alc269vb_laptop_digital_capture_mixer[] = {
|
|||
{ } /* end */
|
||||
};
|
||||
|
||||
static const struct hda_verb alc269_quanta_fl1_verbs[] = {
|
||||
{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
|
||||
{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
|
||||
{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
|
||||
{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC_HP_EVENT | AC_USRSP_EN},
|
||||
{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_MIC_EVENT},
|
||||
{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
|
||||
{ }
|
||||
};
|
||||
|
||||
static const struct hda_verb alc269_lifebook_verbs[] = {
|
||||
{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
|
||||
{0x1a, AC_VERB_SET_CONNECT_SEL, 0x01},
|
||||
{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
|
||||
{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
|
||||
{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC_HP_EVENT | AC_USRSP_EN},
|
||||
{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
|
||||
{0x1a, AC_VERB_SET_UNSOLICITED_ENABLE, ALC_HP_EVENT | AC_USRSP_EN},
|
||||
{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_MIC_EVENT},
|
||||
{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
|
||||
{ }
|
||||
};
|
||||
|
||||
/* toggle speaker-output according to the hp-jack state */
|
||||
static void alc269_quanta_fl1_speaker_automute(struct hda_codec *codec)
|
||||
{
|
||||
alc_hp_automute(codec);
|
||||
|
||||
snd_hda_codec_write(codec, 0x20, 0,
|
||||
AC_VERB_SET_COEF_INDEX, 0x0c);
|
||||
snd_hda_codec_write(codec, 0x20, 0,
|
||||
AC_VERB_SET_PROC_COEF, 0x680);
|
||||
|
||||
snd_hda_codec_write(codec, 0x20, 0,
|
||||
AC_VERB_SET_COEF_INDEX, 0x0c);
|
||||
snd_hda_codec_write(codec, 0x20, 0,
|
||||
AC_VERB_SET_PROC_COEF, 0x480);
|
||||
}
|
||||
|
||||
#define alc269_lifebook_speaker_automute \
|
||||
alc269_quanta_fl1_speaker_automute
|
||||
|
||||
static void alc269_lifebook_mic_autoswitch(struct hda_codec *codec)
|
||||
{
|
||||
unsigned int present_laptop;
|
||||
unsigned int present_dock;
|
||||
|
||||
present_laptop = snd_hda_jack_detect(codec, 0x18);
|
||||
present_dock = snd_hda_jack_detect(codec, 0x1b);
|
||||
|
||||
/* Laptop mic port overrides dock mic port, design decision */
|
||||
if (present_dock)
|
||||
snd_hda_codec_write(codec, 0x23, 0,
|
||||
AC_VERB_SET_CONNECT_SEL, 0x3);
|
||||
if (present_laptop)
|
||||
snd_hda_codec_write(codec, 0x23, 0,
|
||||
AC_VERB_SET_CONNECT_SEL, 0x0);
|
||||
if (!present_dock && !present_laptop)
|
||||
snd_hda_codec_write(codec, 0x23, 0,
|
||||
AC_VERB_SET_CONNECT_SEL, 0x1);
|
||||
}
|
||||
|
||||
static void alc269_quanta_fl1_unsol_event(struct hda_codec *codec,
|
||||
unsigned int res)
|
||||
{
|
||||
switch (res >> 26) {
|
||||
case ALC_HP_EVENT:
|
||||
alc269_quanta_fl1_speaker_automute(codec);
|
||||
break;
|
||||
case ALC_MIC_EVENT:
|
||||
alc_mic_automute(codec);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void alc269_lifebook_unsol_event(struct hda_codec *codec,
|
||||
unsigned int res)
|
||||
{
|
||||
if ((res >> 26) == ALC_HP_EVENT)
|
||||
alc269_lifebook_speaker_automute(codec);
|
||||
if ((res >> 26) == ALC_MIC_EVENT)
|
||||
alc269_lifebook_mic_autoswitch(codec);
|
||||
}
|
||||
|
||||
static void alc269_quanta_fl1_setup(struct hda_codec *codec)
|
||||
{
|
||||
struct alc_spec *spec = codec->spec;
|
||||
spec->autocfg.hp_pins[0] = 0x15;
|
||||
spec->autocfg.speaker_pins[0] = 0x14;
|
||||
spec->automute_mixer_nid[0] = 0x0c;
|
||||
spec->automute = 1;
|
||||
spec->automute_mode = ALC_AUTOMUTE_MIXER;
|
||||
spec->ext_mic_pin = 0x18;
|
||||
spec->int_mic_pin = 0x19;
|
||||
spec->auto_mic = 1;
|
||||
}
|
||||
|
||||
static void alc269_quanta_fl1_init_hook(struct hda_codec *codec)
|
||||
{
|
||||
alc269_quanta_fl1_speaker_automute(codec);
|
||||
alc_mic_automute(codec);
|
||||
}
|
||||
|
||||
static void alc269_lifebook_setup(struct hda_codec *codec)
|
||||
{
|
||||
struct alc_spec *spec = codec->spec;
|
||||
spec->autocfg.hp_pins[0] = 0x15;
|
||||
spec->autocfg.hp_pins[1] = 0x1a;
|
||||
spec->autocfg.speaker_pins[0] = 0x14;
|
||||
spec->automute_mixer_nid[0] = 0x0c;
|
||||
spec->automute = 1;
|
||||
spec->automute_mode = ALC_AUTOMUTE_MIXER;
|
||||
}
|
||||
|
||||
static void alc269_lifebook_init_hook(struct hda_codec *codec)
|
||||
{
|
||||
alc269_lifebook_speaker_automute(codec);
|
||||
alc269_lifebook_mic_autoswitch(codec);
|
||||
}
|
||||
|
||||
static const struct hda_verb alc269_laptop_dmic_init_verbs[] = {
|
||||
{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
|
||||
{0x23, AC_VERB_SET_CONNECT_SEL, 0x05},
|
||||
|
@ -482,15 +301,12 @@ static const struct hda_verb alc269vb_init_verbs[] = {
|
|||
*/
|
||||
static const char * const alc269_models[ALC269_MODEL_LAST] = {
|
||||
[ALC269_BASIC] = "basic",
|
||||
[ALC269_QUANTA_FL1] = "quanta",
|
||||
[ALC269_AMIC] = "laptop-amic",
|
||||
[ALC269_DMIC] = "laptop-dmic",
|
||||
[ALC269_LIFEBOOK] = "lifebook",
|
||||
[ALC269_AUTO] = "auto",
|
||||
};
|
||||
|
||||
static const struct snd_pci_quirk alc269_cfg_tbl[] = {
|
||||
SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_QUANTA_FL1),
|
||||
SND_PCI_QUIRK(0x1043, 0x8330, "ASUS Eeepc P703 P900A",
|
||||
ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1013, "ASUS N61Da", ALC269VB_AMIC),
|
||||
|
@ -529,7 +345,6 @@ static const struct snd_pci_quirk alc269_cfg_tbl[] = {
|
|||
SND_PCI_QUIRK(0x1043, 0x1773, "ASUS U20A", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1883, "ASUS F81Se", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x104d, 0x9071, "Sony VAIO", ALC269_AUTO),
|
||||
SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook ICH9M-based", ALC269_LIFEBOOK),
|
||||
SND_PCI_QUIRK(0x152d, 0x1778, "Quanta ON1", ALC269_DMIC),
|
||||
SND_PCI_QUIRK(0x17aa, 0x3be9, "Quanta Wistron", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_AMIC),
|
||||
|
@ -549,19 +364,6 @@ static const struct alc_config_preset alc269_presets[] = {
|
|||
.channel_mode = alc269_modes,
|
||||
.input_mux = &alc269_capture_source,
|
||||
},
|
||||
[ALC269_QUANTA_FL1] = {
|
||||
.mixers = { alc269_quanta_fl1_mixer },
|
||||
.init_verbs = { alc269_init_verbs, alc269_quanta_fl1_verbs },
|
||||
.num_dacs = ARRAY_SIZE(alc269_dac_nids),
|
||||
.dac_nids = alc269_dac_nids,
|
||||
.hp_nid = 0x03,
|
||||
.num_channel_mode = ARRAY_SIZE(alc269_modes),
|
||||
.channel_mode = alc269_modes,
|
||||
.input_mux = &alc269_capture_source,
|
||||
.unsol_event = alc269_quanta_fl1_unsol_event,
|
||||
.setup = alc269_quanta_fl1_setup,
|
||||
.init_hook = alc269_quanta_fl1_init_hook,
|
||||
},
|
||||
[ALC269_AMIC] = {
|
||||
.mixers = { alc269_laptop_mixer },
|
||||
.cap_mixer = alc269_laptop_analog_capture_mixer,
|
||||
|
@ -618,18 +420,5 @@ static const struct alc_config_preset alc269_presets[] = {
|
|||
.setup = alc269vb_laptop_dmic_setup,
|
||||
.init_hook = alc_inithook,
|
||||
},
|
||||
[ALC269_LIFEBOOK] = {
|
||||
.mixers = { alc269_lifebook_mixer },
|
||||
.init_verbs = { alc269_init_verbs, alc269_lifebook_verbs },
|
||||
.num_dacs = ARRAY_SIZE(alc269_dac_nids),
|
||||
.dac_nids = alc269_dac_nids,
|
||||
.hp_nid = 0x03,
|
||||
.num_channel_mode = ARRAY_SIZE(alc269_modes),
|
||||
.channel_mode = alc269_modes,
|
||||
.input_mux = &alc269_capture_source,
|
||||
.unsol_event = alc269_lifebook_unsol_event,
|
||||
.setup = alc269_lifebook_setup,
|
||||
.init_hook = alc269_lifebook_init_hook,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
@ -159,6 +159,7 @@ struct alc_spec {
|
|||
void (*power_hook)(struct hda_codec *codec);
|
||||
#endif
|
||||
void (*shutup)(struct hda_codec *codec);
|
||||
void (*automute_hook)(struct hda_codec *codec);
|
||||
|
||||
/* for pin sensing */
|
||||
unsigned int jack_present: 1;
|
||||
|
@ -560,6 +561,15 @@ static void update_speakers(struct hda_codec *codec)
|
|||
spec->autocfg.line_out_pins, on, false);
|
||||
}
|
||||
|
||||
static void call_update_speakers(struct hda_codec *codec)
|
||||
{
|
||||
struct alc_spec *spec = codec->spec;
|
||||
if (spec->automute_hook)
|
||||
spec->automute_hook(codec);
|
||||
else
|
||||
update_speakers(codec);
|
||||
}
|
||||
|
||||
/* standard HP-automute helper */
|
||||
static void alc_hp_automute(struct hda_codec *codec)
|
||||
{
|
||||
|
@ -570,7 +580,7 @@ static void alc_hp_automute(struct hda_codec *codec)
|
|||
spec->jack_present =
|
||||
detect_jacks(codec, ARRAY_SIZE(spec->autocfg.hp_pins),
|
||||
spec->autocfg.hp_pins);
|
||||
update_speakers(codec);
|
||||
call_update_speakers(codec);
|
||||
}
|
||||
|
||||
/* standard line-out-automute helper */
|
||||
|
@ -583,7 +593,7 @@ static void alc_line_automute(struct hda_codec *codec)
|
|||
spec->line_jack_present =
|
||||
detect_jacks(codec, ARRAY_SIZE(spec->autocfg.line_out_pins),
|
||||
spec->autocfg.line_out_pins);
|
||||
update_speakers(codec);
|
||||
call_update_speakers(codec);
|
||||
}
|
||||
|
||||
#define get_connection_index(codec, mux, nid) \
|
||||
|
@ -840,7 +850,7 @@ static int alc_automute_mode_put(struct snd_kcontrol *kcontrol,
|
|||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
update_speakers(codec);
|
||||
call_update_speakers(codec);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -4500,6 +4510,30 @@ static void alc269_fixup_stereo_dmic(struct hda_codec *codec,
|
|||
alc_write_coef_idx(codec, 0x07, coef | 0x80);
|
||||
}
|
||||
|
||||
static void alc269_quanta_automute(struct hda_codec *codec)
|
||||
{
|
||||
update_speakers(codec);
|
||||
|
||||
snd_hda_codec_write(codec, 0x20, 0,
|
||||
AC_VERB_SET_COEF_INDEX, 0x0c);
|
||||
snd_hda_codec_write(codec, 0x20, 0,
|
||||
AC_VERB_SET_PROC_COEF, 0x680);
|
||||
|
||||
snd_hda_codec_write(codec, 0x20, 0,
|
||||
AC_VERB_SET_COEF_INDEX, 0x0c);
|
||||
snd_hda_codec_write(codec, 0x20, 0,
|
||||
AC_VERB_SET_PROC_COEF, 0x480);
|
||||
}
|
||||
|
||||
static void alc269_fixup_quanta_mute(struct hda_codec *codec,
|
||||
const struct alc_fixup *fix, int action)
|
||||
{
|
||||
struct alc_spec *spec = codec->spec;
|
||||
if (action != ALC_FIXUP_ACT_PROBE)
|
||||
return;
|
||||
spec->automute_hook = alc269_quanta_automute;
|
||||
}
|
||||
|
||||
enum {
|
||||
ALC269_FIXUP_SONY_VAIO,
|
||||
ALC275_FIXUP_SONY_VAIO_GPIO2,
|
||||
|
@ -4511,6 +4545,8 @@ enum {
|
|||
ALC271_FIXUP_DMIC,
|
||||
ALC269_FIXUP_PCM_44K,
|
||||
ALC269_FIXUP_STEREO_DMIC,
|
||||
ALC269_FIXUP_QUANTA_MUTE,
|
||||
ALC269_FIXUP_LIFEBOOK,
|
||||
};
|
||||
|
||||
static const struct alc_fixup alc269_fixups[] = {
|
||||
|
@ -4577,6 +4613,20 @@ static const struct alc_fixup alc269_fixups[] = {
|
|||
.type = ALC_FIXUP_FUNC,
|
||||
.v.func = alc269_fixup_stereo_dmic,
|
||||
},
|
||||
[ALC269_FIXUP_QUANTA_MUTE] = {
|
||||
.type = ALC_FIXUP_FUNC,
|
||||
.v.func = alc269_fixup_quanta_mute,
|
||||
},
|
||||
[ALC269_FIXUP_LIFEBOOK] = {
|
||||
.type = ALC_FIXUP_PINS,
|
||||
.v.pins = (const struct alc_pincfg[]) {
|
||||
{ 0x1a, 0x2101103f }, /* dock line-out */
|
||||
{ 0x1b, 0x23a11040 }, /* dock mic-in */
|
||||
{ }
|
||||
},
|
||||
.chained = true,
|
||||
.chain_id = ALC269_FIXUP_QUANTA_MUTE
|
||||
},
|
||||
};
|
||||
|
||||
static const struct snd_pci_quirk alc269_fixup_tbl[] = {
|
||||
|
@ -4592,11 +4642,13 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
|
|||
SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),
|
||||
SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),
|
||||
SND_PCI_QUIRK_VENDOR(0x1025, "Acer Aspire", ALC271_FIXUP_DMIC),
|
||||
SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook", ALC269_FIXUP_LIFEBOOK),
|
||||
SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE),
|
||||
SND_PCI_QUIRK(0x17aa, 0x215e, "Thinkpad L512", ALC269_FIXUP_SKU_IGNORE),
|
||||
SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE),
|
||||
SND_PCI_QUIRK(0x17aa, 0x21ca, "Thinkpad L412", ALC269_FIXUP_SKU_IGNORE),
|
||||
SND_PCI_QUIRK(0x17aa, 0x21e9, "Thinkpad Edge 15", ALC269_FIXUP_SKU_IGNORE),
|
||||
SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_QUANTA_MUTE),
|
||||
SND_PCI_QUIRK(0x17aa, 0x3bf8, "Lenovo Ideapd", ALC269_FIXUP_PCM_44K),
|
||||
SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),
|
||||
{}
|
||||
|
|
Loading…
Reference in a new issue