Skip to content

Commit 43a6473

Browse files
committed
Merge tag 'sound-5.14-rc7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull more sound fixes from Takashi Iwai: "This is a quick follow up for 5.14: a fix for a very recently introduced regression on ASoC Intel Atom driver, and another trivial HD-audio quirk for HP laptops" * tag 'sound-5.14-rc7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ASoC: intel: atom: Fix breakage for PCM buffer address setup ALSA: hda/realtek: Limit mic boost on HP ProBook 445 G8
2 parents 54e9ea3 + 65ca89c commit 43a6473

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

sound/pci/hda/patch_realtek.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6658,6 +6658,7 @@ enum {
66586658
ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP,
66596659
ALC623_FIXUP_LENOVO_THINKSTATION_P340,
66606660
ALC255_FIXUP_ACER_HEADPHONE_AND_MIC,
6661+
ALC236_FIXUP_HP_LIMIT_INT_MIC_BOOST,
66616662
};
66626663

66636664
static const struct hda_fixup alc269_fixups[] = {
@@ -8242,6 +8243,12 @@ static const struct hda_fixup alc269_fixups[] = {
82428243
.chained = true,
82438244
.chain_id = ALC255_FIXUP_XIAOMI_HEADSET_MIC
82448245
},
8246+
[ALC236_FIXUP_HP_LIMIT_INT_MIC_BOOST] = {
8247+
.type = HDA_FIXUP_FUNC,
8248+
.v.func = alc269_fixup_limit_int_mic_boost,
8249+
.chained = true,
8250+
.chain_id = ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF,
8251+
},
82458252
};
82468253

82478254
static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -8438,8 +8445,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
84388445
SND_PCI_QUIRK(0x103c, 0x8847, "HP EliteBook x360 830 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
84398446
SND_PCI_QUIRK(0x103c, 0x884b, "HP EliteBook 840 Aero G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
84408447
SND_PCI_QUIRK(0x103c, 0x884c, "HP EliteBook 840 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
8441-
SND_PCI_QUIRK(0x103c, 0x8862, "HP ProBook 445 G8 Notebook PC", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
8442-
SND_PCI_QUIRK(0x103c, 0x8863, "HP ProBook 445 G8 Notebook PC", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
8448+
SND_PCI_QUIRK(0x103c, 0x8862, "HP ProBook 445 G8 Notebook PC", ALC236_FIXUP_HP_LIMIT_INT_MIC_BOOST),
8449+
SND_PCI_QUIRK(0x103c, 0x8863, "HP ProBook 445 G8 Notebook PC", ALC236_FIXUP_HP_LIMIT_INT_MIC_BOOST),
84438450
SND_PCI_QUIRK(0x103c, 0x886d, "HP ZBook Fury 17.3 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),
84448451
SND_PCI_QUIRK(0x103c, 0x8870, "HP ZBook Fury 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),
84458452
SND_PCI_QUIRK(0x103c, 0x8873, "HP ZBook Studio 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),

sound/soc/intel/atom/sst-mfld-platform-pcm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ static void sst_fill_alloc_params(struct snd_pcm_substream *substream,
127127
snd_pcm_uframes_t period_size;
128128
ssize_t periodbytes;
129129
ssize_t buffer_bytes = snd_pcm_lib_buffer_bytes(substream);
130-
u32 buffer_addr = substream->runtime->dma_addr;
130+
u32 buffer_addr = virt_to_phys(substream->runtime->dma_area);
131131

132132
channels = substream->runtime->channels;
133133
period_size = substream->runtime->period_size;

0 commit comments

Comments
 (0)