Skip to content

Commit

Permalink
ALSA: hda - Add LFE chmap to ASUS ET2700
Browse files Browse the repository at this point in the history
As the previous commit 1f0bbf0 added the pin config for the bass
speaker, this patch adds the corresponding LFE-only channel map on
ASUS ET2700.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=65961
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
tiwai committed Nov 28, 2013
1 parent 1f0bbf0 commit eb9ca3a
Showing 1 changed file with 13 additions and 3 deletions.
16 changes: 13 additions & 3 deletions sound/pci/hda/patch_realtek.c
Original file line number Diff line number Diff line change
Expand Up @@ -1783,6 +1783,7 @@ enum {
ALC882_FIXUP_INV_DMIC,
ALC882_FIXUP_NO_PRIMARY_HP,
ALC887_FIXUP_ASUS_BASS,
ALC887_FIXUP_BASS_CHMAP,
};

static void alc889_fixup_coef(struct hda_codec *codec,
Expand Down Expand Up @@ -1916,6 +1917,9 @@ static void alc882_fixup_no_primary_hp(struct hda_codec *codec,
}
}

static void alc_fixup_bass_chmap(struct hda_codec *codec,
const struct hda_fixup *fix, int action);

static const struct hda_fixup alc882_fixups[] = {
[ALC882_FIXUP_ABIT_AW9D_MAX] = {
.type = HDA_FIXUP_PINS,
Expand Down Expand Up @@ -2112,6 +2116,12 @@ static const struct hda_fixup alc882_fixups[] = {
{0x16, 0x99130130}, /* bass speaker */
{}
},
.chained = true,
.chain_id = ALC887_FIXUP_BASS_CHMAP,
},
[ALC887_FIXUP_BASS_CHMAP] = {
.type = HDA_FIXUP_FUNC,
.v.func = alc_fixup_bass_chmap,
},
};

Expand Down Expand Up @@ -4731,7 +4741,7 @@ static const struct snd_pcm_chmap_elem asus_pcm_2_1_chmaps[] = {
};

/* override the 2.1 chmap */
static void alc662_fixup_bass_chmap(struct hda_codec *codec,
static void alc_fixup_bass_chmap(struct hda_codec *codec,
const struct hda_fixup *fix, int action)
{
if (action == HDA_FIXUP_ACT_BUILD) {
Expand Down Expand Up @@ -4939,7 +4949,7 @@ static const struct hda_fixup alc662_fixups[] = {
},
[ALC662_FIXUP_BASS_CHMAP] = {
.type = HDA_FIXUP_FUNC,
.v.func = alc662_fixup_bass_chmap,
.v.func = alc_fixup_bass_chmap,
.chained = true,
.chain_id = ALC662_FIXUP_ASUS_MODE4
},
Expand All @@ -4952,7 +4962,7 @@ static const struct hda_fixup alc662_fixups[] = {
},
[ALC662_FIXUP_BASS_1A_CHMAP] = {
.type = HDA_FIXUP_FUNC,
.v.func = alc662_fixup_bass_chmap,
.v.func = alc_fixup_bass_chmap,
.chained = true,
.chain_id = ALC662_FIXUP_BASS_1A,
},
Expand Down

0 comments on commit eb9ca3a

Please sign in to comment.