Skip to content

L
linux
Commit 5ff5c3a4 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

Merge branch 'fix/hda' into topic/hda 

Conflicts:
	sound/pci/hda/patch_conexant.c
parents 18dcd304 250f3274
Show whitespace changes
Inline Side-by-side
Showing with 61 additions and 77 deletions
sound/pci/asihpi/hpi_internal.h
View file @ 5ff5c3a4
/****************************************************************************** /******************************************************************************
AudioScience HPI driver AudioScience HPI driver
Copyright (C) 1997-2011 AudioScience Inc. <support@audioscience.com> Copyright (C) 1997-2012 AudioScience Inc. <support@audioscience.com>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of version 2 of the GNU General Public License as it under the terms of version 2 of the GNU General Public License as
...@@ -42,7 +42,7 @@ On error *pLockedMemHandle marked invalid, non-zero returned. ...@@ -42,7 +42,7 @@ On error *pLockedMemHandle marked invalid, non-zero returned.
If this function succeeds, then HpiOs_LockedMem_GetVirtAddr() and If this function succeeds, then HpiOs_LockedMem_GetVirtAddr() and
HpiOs_LockedMem_GetPyhsAddr() will always succed on the returned handle. HpiOs_LockedMem_GetPyhsAddr() will always succed on the returned handle.
*/ */
int hpios_locked_mem_alloc(struct consistent_dma_area *p_locked_mem_handle, u16 hpios_locked_mem_alloc(struct consistent_dma_area *p_locked_mem_handle,
/**< memory handle */ /**< memory handle */
u32 size, /**< Size in bytes to allocate */ u32 size, /**< Size in bytes to allocate */
struct pci_dev *p_os_reference struct pci_dev *p_os_reference
......
sound/pci/asihpi/hpios.c
View file @ 5ff5c3a4
/****************************************************************************** /******************************************************************************
AudioScience HPI driver AudioScience HPI driver
Copyright (C) 1997-2011 AudioScience Inc. <support@audioscience.com> Copyright (C) 1997-2012 AudioScience Inc. <support@audioscience.com>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of version 2 of the GNU General Public License as it under the terms of version 2 of the GNU General Public License as
...@@ -39,11 +39,11 @@ void hpios_delay_micro_seconds(u32 num_micro_sec) ...@@ -39,11 +39,11 @@ void hpios_delay_micro_seconds(u32 num_micro_sec)
} }
/** Allocated an area of locked memory for bus master DMA operations. /** Allocate an area of locked memory for bus master DMA operations.
On error, return -ENOMEM, and *pMemArea.size = 0 If allocation fails, return 1, and *pMemArea.size = 0
*/ */
int hpios_locked_mem_alloc(struct consistent_dma_area *p_mem_area, u32 size, u16 hpios_locked_mem_alloc(struct consistent_dma_area *p_mem_area, u32 size,
struct pci_dev *pdev) struct pci_dev *pdev)
{ {
/*?? any benefit in using managed dmam_alloc_coherent? */ /*?? any benefit in using managed dmam_alloc_coherent? */
...@@ -62,7 +62,7 @@ int hpios_locked_mem_alloc(struct consistent_dma_area *p_mem_area, u32 size, ...@@ -62,7 +62,7 @@ int hpios_locked_mem_alloc(struct consistent_dma_area *p_mem_area, u32 size,
HPI_DEBUG_LOG(WARNING, HPI_DEBUG_LOG(WARNING,
"failed to allocate %d bytes locked memory\n", size); "failed to allocate %d bytes locked memory\n", size);
p_mem_area->size = 0; p_mem_area->size = 0;
return -ENOMEM; return 1;
} }
} }
......
sound/pci/hda/hda_codec.h
View file @ 5ff5c3a4
...@@ -851,6 +851,9 @@ struct hda_codec { ...@@ -851,6 +851,9 @@ struct hda_codec {
unsigned int pin_amp_workaround:1; /* pin out-amp takes index unsigned int pin_amp_workaround:1; /* pin out-amp takes index
* (e.g. Conexant codecs) * (e.g. Conexant codecs)
*/ */
unsigned int single_adc_amp:1; /* adc in-amp takes no index
* (e.g. CX20549 codec)
*/
unsigned int no_sticky_stream:1; /* no sticky-PCM stream assignment */ unsigned int no_sticky_stream:1; /* no sticky-PCM stream assignment */
unsigned int pins_shutup:1; /* pins are shut up */ unsigned int pins_shutup:1; /* pins are shut up */
unsigned int no_trigger_sense:1; /* don't trigger at pin-sensing */ unsigned int no_trigger_sense:1; /* don't trigger at pin-sensing */
......
sound/pci/hda/hda_proc.c
View file @ 5ff5c3a4
...@@ -651,9 +651,16 @@ static void print_codec_info(struct snd_info_entry *entry, ...@@ -651,9 +651,16 @@ static void print_codec_info(struct snd_info_entry *entry,
snd_iprintf(buffer, " Amp-In caps: "); snd_iprintf(buffer, " Amp-In caps: ");
print_amp_caps(buffer, codec, nid, HDA_INPUT); print_amp_caps(buffer, codec, nid, HDA_INPUT);
snd_iprintf(buffer, " Amp-In vals: "); snd_iprintf(buffer, " Amp-In vals: ");
if (wid_type == AC_WID_PIN ||
(codec->single_adc_amp &&
wid_type == AC_WID_AUD_IN))
print_amp_vals(buffer, codec, nid, HDA_INPUT, print_amp_vals(buffer, codec, nid, HDA_INPUT,
wid_caps & AC_WCAP_STEREO, wid_caps & AC_WCAP_STEREO,
wid_type == AC_WID_PIN ? 1 : conn_len); 1);
else
print_amp_vals(buffer, codec, nid, HDA_INPUT,
wid_caps & AC_WCAP_STEREO,
conn_len);
} }
if (wid_caps & AC_WCAP_OUT_AMP) { if (wid_caps & AC_WCAP_OUT_AMP) {
snd_iprintf(buffer, " Amp-Out caps: "); snd_iprintf(buffer, " Amp-Out caps: ");
......
sound/pci/hda/patch_conexant.c
View file @ 5ff5c3a4
...@@ -141,7 +141,6 @@ struct conexant_spec { ...@@ -141,7 +141,6 @@ struct conexant_spec {
unsigned int hp_laptop:1; unsigned int hp_laptop:1;
unsigned int asus:1; unsigned int asus:1;
unsigned int pin_eapd_ctrls:1; unsigned int pin_eapd_ctrls:1;
unsigned int single_adc_amp:1;
unsigned int fixup_stereo_dmic:1; unsigned int fixup_stereo_dmic:1;
unsigned int adc_switching:1; unsigned int adc_switching:1;
...@@ -688,18 +687,17 @@ static const struct hda_channel_mode cxt5045_modes[1] = { ...@@ -688,18 +687,17 @@ static const struct hda_channel_mode cxt5045_modes[1] = {
static const struct hda_input_mux cxt5045_capture_source = { static const struct hda_input_mux cxt5045_capture_source = {
.num_items = 2, .num_items = 2,
.items = { .items = {
{ "IntMic", 0x1 }, { "Internal Mic", 0x1 },
{ "ExtMic", 0x2 }, { "Mic", 0x2 },
} }
}; };
static const struct hda_input_mux cxt5045_capture_source_benq = { static const struct hda_input_mux cxt5045_capture_source_benq = {
.num_items = 5, .num_items = 4,
.items = { .items = {
{ "IntMic", 0x1 }, { "Internal Mic", 0x1 },
{ "ExtMic", 0x2 }, { "Mic", 0x2 },
{ "LineIn", 0x3 }, { "Line", 0x3 },
{ "CD", 0x4 },
{ "Mixer", 0x0 }, { "Mixer", 0x0 },
} }
}; };
...@@ -707,8 +705,8 @@ static const struct hda_input_mux cxt5045_capture_source_benq = { ...@@ -707,8 +705,8 @@ static const struct hda_input_mux cxt5045_capture_source_benq = {
static const struct hda_input_mux cxt5045_capture_source_hp530 = { static const struct hda_input_mux cxt5045_capture_source_hp530 = {
.num_items = 2, .num_items = 2,
.items = { .items = {
{ "ExtMic", 0x1 }, { "Mic", 0x1 },
{ "IntMic", 0x2 }, { "Internal Mic", 0x2 },
} }
}; };
...@@ -799,10 +797,8 @@ static void cxt5045_hp_unsol_event(struct hda_codec *codec, ...@@ -799,10 +797,8 @@ static void cxt5045_hp_unsol_event(struct hda_codec *codec,
} }
static const struct snd_kcontrol_new cxt5045_mixers[] = { static const struct snd_kcontrol_new cxt5045_mixers[] = {
HDA_CODEC_VOLUME("Internal Mic Capture Volume", 0x1a, 0x01, HDA_INPUT), HDA_CODEC_VOLUME("Capture Volume", 0x1a, 0x00, HDA_INPUT),
HDA_CODEC_MUTE("Internal Mic Capture Switch", 0x1a, 0x01, HDA_INPUT), HDA_CODEC_MUTE("Capture Switch", 0x1a, 0x0, HDA_INPUT),
HDA_CODEC_VOLUME("Mic Capture Volume", 0x1a, 0x02, HDA_INPUT),
HDA_CODEC_MUTE("Mic Capture Switch", 0x1a, 0x02, HDA_INPUT),
HDA_CODEC_VOLUME("PCM Playback Volume", 0x17, 0x0, HDA_INPUT), HDA_CODEC_VOLUME("PCM Playback Volume", 0x17, 0x0, HDA_INPUT),
HDA_CODEC_MUTE("PCM Playback Switch", 0x17, 0x0, HDA_INPUT), HDA_CODEC_MUTE("PCM Playback Switch", 0x17, 0x0, HDA_INPUT),
HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x17, 0x1, HDA_INPUT), HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x17, 0x1, HDA_INPUT),
...@@ -823,27 +819,15 @@ static const struct snd_kcontrol_new cxt5045_mixers[] = { ...@@ -823,27 +819,15 @@ static const struct snd_kcontrol_new cxt5045_mixers[] = {
}; };
static const struct snd_kcontrol_new cxt5045_benq_mixers[] = { static const struct snd_kcontrol_new cxt5045_benq_mixers[] = {
HDA_CODEC_VOLUME("CD Capture Volume", 0x1a, 0x04, HDA_INPUT), HDA_CODEC_VOLUME("Line Playback Volume", 0x17, 0x3, HDA_INPUT),
HDA_CODEC_MUTE("CD Capture Switch", 0x1a, 0x04, HDA_INPUT), HDA_CODEC_MUTE("Line Playback Switch", 0x17, 0x3, HDA_INPUT),
HDA_CODEC_VOLUME("CD Playback Volume", 0x17, 0x4, HDA_INPUT),
HDA_CODEC_MUTE("CD Playback Switch", 0x17, 0x4, HDA_INPUT),
HDA_CODEC_VOLUME("Line In Capture Volume", 0x1a, 0x03, HDA_INPUT),
HDA_CODEC_MUTE("Line In Capture Switch", 0x1a, 0x03, HDA_INPUT),
HDA_CODEC_VOLUME("Line In Playback Volume", 0x17, 0x3, HDA_INPUT),
HDA_CODEC_MUTE("Line In Playback Switch", 0x17, 0x3, HDA_INPUT),
HDA_CODEC_VOLUME("Mixer Capture Volume", 0x1a, 0x0, HDA_INPUT),
HDA_CODEC_MUTE("Mixer Capture Switch", 0x1a, 0x0, HDA_INPUT),
{} {}
}; };
static const struct snd_kcontrol_new cxt5045_mixers_hp530[] = { static const struct snd_kcontrol_new cxt5045_mixers_hp530[] = {
HDA_CODEC_VOLUME("Internal Mic Capture Volume", 0x1a, 0x02, HDA_INPUT), HDA_CODEC_VOLUME("Capture Volume", 0x1a, 0x00, HDA_INPUT),
HDA_CODEC_MUTE("Internal Mic Capture Switch", 0x1a, 0x02, HDA_INPUT), HDA_CODEC_MUTE("Capture Switch", 0x1a, 0x0, HDA_INPUT),
HDA_CODEC_VOLUME("Mic Capture Volume", 0x1a, 0x01, HDA_INPUT),
HDA_CODEC_MUTE("Mic Capture Switch", 0x1a, 0x01, HDA_INPUT),
HDA_CODEC_VOLUME("PCM Playback Volume", 0x17, 0x0, HDA_INPUT), HDA_CODEC_VOLUME("PCM Playback Volume", 0x17, 0x0, HDA_INPUT),
HDA_CODEC_MUTE("PCM Playback Switch", 0x17, 0x0, HDA_INPUT), HDA_CODEC_MUTE("PCM Playback Switch", 0x17, 0x0, HDA_INPUT),
HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x17, 0x2, HDA_INPUT), HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x17, 0x2, HDA_INPUT),
...@@ -947,10 +931,10 @@ static const struct snd_kcontrol_new cxt5045_test_mixer[] = { ...@@ -947,10 +931,10 @@ static const struct snd_kcontrol_new cxt5045_test_mixer[] = {
/* Output controls */ /* Output controls */
HDA_CODEC_VOLUME("Speaker Playback Volume", 0x10, 0x0, HDA_OUTPUT), HDA_CODEC_VOLUME("Speaker Playback Volume", 0x10, 0x0, HDA_OUTPUT),
HDA_CODEC_MUTE("Speaker Playback Switch", 0x10, 0x0, HDA_OUTPUT), HDA_CODEC_MUTE("Speaker Playback Switch", 0x10, 0x0, HDA_OUTPUT),
HDA_CODEC_VOLUME("Node 11 Playback Volume", 0x11, 0x0, HDA_OUTPUT), HDA_CODEC_VOLUME("HP-OUT Playback Volume", 0x11, 0x0, HDA_OUTPUT),
HDA_CODEC_MUTE("Node 11 Playback Switch", 0x11, 0x0, HDA_OUTPUT), HDA_CODEC_MUTE("HP-OUT Playback Switch", 0x11, 0x0, HDA_OUTPUT),
HDA_CODEC_VOLUME("Node 12 Playback Volume", 0x12, 0x0, HDA_OUTPUT), HDA_CODEC_VOLUME("LINE1 Playback Volume", 0x12, 0x0, HDA_OUTPUT),
HDA_CODEC_MUTE("Node 12 Playback Switch", 0x12, 0x0, HDA_OUTPUT), HDA_CODEC_MUTE("LINE1 Playback Switch", 0x12, 0x0, HDA_OUTPUT),
/* Modes for retasking pin widgets */ /* Modes for retasking pin widgets */
CXT_PIN_MODE("HP-OUT pin mode", 0x11, CXT_PIN_DIR_INOUT), CXT_PIN_MODE("HP-OUT pin mode", 0x11, CXT_PIN_DIR_INOUT),
...@@ -961,16 +945,16 @@ static const struct snd_kcontrol_new cxt5045_test_mixer[] = { ...@@ -961,16 +945,16 @@ static const struct snd_kcontrol_new cxt5045_test_mixer[] = {
/* Loopback mixer controls */ /* Loopback mixer controls */
HDA_CODEC_VOLUME("Mixer-1 Volume", 0x17, 0x0, HDA_INPUT), HDA_CODEC_VOLUME("PCM Volume", 0x17, 0x0, HDA_INPUT),
HDA_CODEC_MUTE("Mixer-1 Switch", 0x17, 0x0, HDA_INPUT), HDA_CODEC_MUTE("PCM Switch", 0x17, 0x0, HDA_INPUT),
HDA_CODEC_VOLUME("Mixer-2 Volume", 0x17, 0x1, HDA_INPUT), HDA_CODEC_VOLUME("MIC1 pin Volume", 0x17, 0x1, HDA_INPUT),
HDA_CODEC_MUTE("Mixer-2 Switch", 0x17, 0x1, HDA_INPUT), HDA_CODEC_MUTE("MIC1 pin Switch", 0x17, 0x1, HDA_INPUT),
HDA_CODEC_VOLUME("Mixer-3 Volume", 0x17, 0x2, HDA_INPUT), HDA_CODEC_VOLUME("LINE1 pin Volume", 0x17, 0x2, HDA_INPUT),
HDA_CODEC_MUTE("Mixer-3 Switch", 0x17, 0x2, HDA_INPUT), HDA_CODEC_MUTE("LINE1 pin Switch", 0x17, 0x2, HDA_INPUT),
HDA_CODEC_VOLUME("Mixer-4 Volume", 0x17, 0x3, HDA_INPUT), HDA_CODEC_VOLUME("HP-OUT pin Volume", 0x17, 0x3, HDA_INPUT),
HDA_CODEC_MUTE("Mixer-4 Switch", 0x17, 0x3, HDA_INPUT), HDA_CODEC_MUTE("HP-OUT pin Switch", 0x17, 0x3, HDA_INPUT),
HDA_CODEC_VOLUME("Mixer-5 Volume", 0x17, 0x4, HDA_INPUT), HDA_CODEC_VOLUME("CD pin Volume", 0x17, 0x4, HDA_INPUT),
HDA_CODEC_MUTE("Mixer-5 Switch", 0x17, 0x4, HDA_INPUT), HDA_CODEC_MUTE("CD pin Switch", 0x17, 0x4, HDA_INPUT),
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Input Source", .name = "Input Source",
...@@ -979,16 +963,8 @@ static const struct snd_kcontrol_new cxt5045_test_mixer[] = { ...@@ -979,16 +963,8 @@ static const struct snd_kcontrol_new cxt5045_test_mixer[] = {
.put = conexant_mux_enum_put, .put = conexant_mux_enum_put,
}, },
/* Audio input controls */ /* Audio input controls */
HDA_CODEC_VOLUME("Input-1 Volume", 0x1a, 0x0, HDA_INPUT), HDA_CODEC_VOLUME("Capture Volume", 0x1a, 0x0, HDA_INPUT),
HDA_CODEC_MUTE("Input-1 Switch", 0x1a, 0x0, HDA_INPUT), HDA_CODEC_MUTE("Capture Switch", 0x1a, 0x0, HDA_INPUT),
HDA_CODEC_VOLUME("Input-2 Volume", 0x1a, 0x1, HDA_INPUT),
HDA_CODEC_MUTE("Input-2 Switch", 0x1a, 0x1, HDA_INPUT),
HDA_CODEC_VOLUME("Input-3 Volume", 0x1a, 0x2, HDA_INPUT),
HDA_CODEC_MUTE("Input-3 Switch", 0x1a, 0x2, HDA_INPUT),
HDA_CODEC_VOLUME("Input-4 Volume", 0x1a, 0x3, HDA_INPUT),
HDA_CODEC_MUTE("Input-4 Switch", 0x1a, 0x3, HDA_INPUT),
HDA_CODEC_VOLUME("Input-5 Volume", 0x1a, 0x4, HDA_INPUT),
HDA_CODEC_MUTE("Input-5 Switch", 0x1a, 0x4, HDA_INPUT),
{ } /* end */ { } /* end */
}; };
...@@ -1010,10 +986,6 @@ static const struct hda_verb cxt5045_test_init_verbs[] = { ...@@ -1010,10 +986,6 @@ static const struct hda_verb cxt5045_test_init_verbs[] = {
{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
{0x18, AC_VERB_SET_DIGI_CONVERT_1, 0}, {0x18, AC_VERB_SET_DIGI_CONVERT_1, 0},
/* Start with output sum widgets muted and their output gains at min */
{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
/* Unmute retasking pin widget output buffers since the default /* Unmute retasking pin widget output buffers since the default
* state appears to be output. As the pin mode is changed by the * state appears to be output. As the pin mode is changed by the
* user the pin mode control will take care of enabling the pin's * user the pin mode control will take care of enabling the pin's
...@@ -1028,11 +1000,11 @@ static const struct hda_verb cxt5045_test_init_verbs[] = { ...@@ -1028,11 +1000,11 @@ static const struct hda_verb cxt5045_test_init_verbs[] = {
/* Set ADC connection select to match default mixer setting (mic1 /* Set ADC connection select to match default mixer setting (mic1
* pin) * pin)
*/ */
{0x1a, AC_VERB_SET_CONNECT_SEL, 0x00}, {0x1a, AC_VERB_SET_CONNECT_SEL, 0x01},
{0x17, AC_VERB_SET_CONNECT_SEL, 0x00}, {0x17, AC_VERB_SET_CONNECT_SEL, 0x01},
/* Mute all inputs to mixer widget (even unconnected ones) */ /* Mute all inputs to mixer widget (even unconnected ones) */
{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* Mixer pin */ {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* Mixer */
{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* Mic1 pin */ {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* Mic1 pin */
{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* Line pin */ {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* Line pin */
{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* HP pin */ {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* HP pin */
...@@ -1111,7 +1083,7 @@ static int patch_cxt5045(struct hda_codec *codec) ...@@ -1111,7 +1083,7 @@ static int patch_cxt5045(struct hda_codec *codec)
if (!spec) if (!spec)
return -ENOMEM; return -ENOMEM;
codec->spec = spec; codec->spec = spec;
codec->pin_amp_workaround = 1; codec->single_adc_amp = 1;
spec->multiout.max_channels = 2; spec->multiout.max_channels = 2;
spec->multiout.num_dacs = ARRAY_SIZE(cxt5045_dac_nids); spec->multiout.num_dacs = ARRAY_SIZE(cxt5045_dac_nids);
...@@ -4252,7 +4224,7 @@ static int cx_auto_add_capture_volume(struct hda_codec *codec, hda_nid_t nid, ...@@ -4252,7 +4224,7 @@ static int cx_auto_add_capture_volume(struct hda_codec *codec, hda_nid_t nid,
int idx = get_input_connection(codec, adc_nid, nid); int idx = get_input_connection(codec, adc_nid, nid);
if (idx < 0) if (idx < 0)
continue; continue;
if (spec->single_adc_amp) if (codec->single_adc_amp)
idx = 0; idx = 0;
if (cx_auto_get_rightch_label(codec, label, rightch_label, nid)) { if (cx_auto_get_rightch_label(codec, label, rightch_label, nid)) {
...@@ -4327,7 +4299,7 @@ static int cx_auto_build_input_controls(struct hda_codec *codec) ...@@ -4327,7 +4299,7 @@ static int cx_auto_build_input_controls(struct hda_codec *codec)
if (cidx < 0) if (cidx < 0)
continue; continue;
input_conn[i] = spec->imux_info[i].adc; input_conn[i] = spec->imux_info[i].adc;
if (!spec->single_adc_amp) if (!codec->single_adc_amp)
input_conn[i] |= cidx << 8; input_conn[i] |= cidx << 8;
if (i > 0 && input_conn[i] != input_conn[0]) if (i > 0 && input_conn[i] != input_conn[0])
multi_connection = 1; multi_connection = 1;
...@@ -4528,15 +4500,17 @@ static int patch_conexant_auto(struct hda_codec *codec) ...@@ -4528,15 +4500,17 @@ static int patch_conexant_auto(struct hda_codec *codec)
if (!spec) if (!spec)
return -ENOMEM; return -ENOMEM;
codec->spec = spec; codec->spec = spec;
codec->pin_amp_workaround = 1;
switch (codec->vendor_id) { switch (codec->vendor_id) {
case 0x14f15045: case 0x14f15045:
spec->single_adc_amp = 1; codec->single_adc_amp = 1;
break; break;
case 0x14f15051: case 0x14f15051:
add_cx5051_fake_mutes(codec); add_cx5051_fake_mutes(codec);
codec->pin_amp_workaround = 1;
break; break;
default:
codec->pin_amp_workaround = 1;
} }
apply_fixup(codec, cxt_fixups, cxt_pincfg_tbl); apply_fixup(codec, cxt_fixups, cxt_pincfg_tbl);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7