Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sound-fix-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"A few last-minute fixes. The significant ones are two ASoC SOF
regression fixes while the rest are trivial HD-audio quirks.
All are small / one-liners and should be pretty safe to take"
* tag 'sound-fix-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ASoC: SOF: Intel: hda-dai: fix possible stream_tag leak
ALSA: hda/realtek: Enable mute/micmute LEDs and speaker support for HP Laptops
ALSA: hda/realtek: fix mute/micmute LEDs don't work for a HP platform.
ALSA: hda/realtek - fixed wrong gpio assigned
ALSA: hda: Fix codec device field initializan
ALSA: hda/conexant: add a new hda codec SN6180
ASoC: SOF: ops: refine parameters order in function snd_sof_dsp_update8
+15
-7
+1
-1
sound/pci/hda/hda_codec.c
+1
-1
sound/pci/hda/hda_codec.c
···
927
927
codec->depop_delay = -1;
928
928
codec->fixup_id = HDA_FIXUP_ID_NOT_SET;
929
929
codec->core.dev.release = snd_hda_codec_dev_release;
930
-
codec->core.exec_verb = codec_exec_verb;
931
930
codec->core.type = HDA_DEV_LEGACY;
932
931
933
932
mutex_init(&codec->spdif_mutex);
···
997
998
if (snd_BUG_ON(codec_addr > HDA_MAX_CODEC_ADDRESS))
998
999
return -EINVAL;
999
1000
1001
+
codec->core.exec_verb = codec_exec_verb;
1000
1002
codec->card = card;
1001
1003
codec->addr = codec_addr;
1002
1004
+1
sound/pci/hda/patch_conexant.c
+1
sound/pci/hda/patch_conexant.c
···
1125
1125
HDA_CODEC_ENTRY(0x14f11f87, "SN6140", patch_conexant_auto),
1126
1126
HDA_CODEC_ENTRY(0x14f12008, "CX8200", patch_conexant_auto),
1127
1127
HDA_CODEC_ENTRY(0x14f120d0, "CX11970", patch_conexant_auto),
1128
+
HDA_CODEC_ENTRY(0x14f120d1, "SN6180", patch_conexant_auto),
1128
1129
HDA_CODEC_ENTRY(0x14f15045, "CX20549 (Venice)", patch_conexant_auto),
1129
1130
HDA_CODEC_ENTRY(0x14f15047, "CX20551 (Waikiki)", patch_conexant_auto),
1130
1131
HDA_CODEC_ENTRY(0x14f15051, "CX20561 (Hermosa)", patch_conexant_auto),
+8
-1
sound/pci/hda/patch_realtek.c
+8
-1
sound/pci/hda/patch_realtek.c
···
832
832
alc_setup_gpio(codec, 0x02);
833
833
break;
834
834
case 7:
835
-
alc_setup_gpio(codec, 0x03);
835
+
alc_setup_gpio(codec, 0x04);
836
836
break;
837
837
case 5:
838
838
default:
···
9432
9432
SND_PCI_QUIRK(0x103c, 0x8abb, "HP ZBook Firefly 14 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
9433
9433
SND_PCI_QUIRK(0x103c, 0x8ad1, "HP EliteBook 840 14 inch G9 Notebook PC", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
9434
9434
SND_PCI_QUIRK(0x103c, 0x8ad2, "HP EliteBook 860 16 inch G9 Notebook PC", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
9435
+
SND_PCI_QUIRK(0x103c, 0x8b42, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
9436
+
SND_PCI_QUIRK(0x103c, 0x8b43, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
9437
+
SND_PCI_QUIRK(0x103c, 0x8b44, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
9438
+
SND_PCI_QUIRK(0x103c, 0x8b45, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
9439
+
SND_PCI_QUIRK(0x103c, 0x8b46, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
9440
+
SND_PCI_QUIRK(0x103c, 0x8b47, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
9435
9441
SND_PCI_QUIRK(0x103c, 0x8b5d, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
9436
9442
SND_PCI_QUIRK(0x103c, 0x8b5e, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
9437
9443
SND_PCI_QUIRK(0x103c, 0x8b7a, "HP", ALC236_FIXUP_HP_GPIO_LED),
9438
9444
SND_PCI_QUIRK(0x103c, 0x8b7d, "HP", ALC236_FIXUP_HP_GPIO_LED),
9445
+
SND_PCI_QUIRK(0x103c, 0x8b87, "HP", ALC236_FIXUP_HP_GPIO_LED),
9439
9446
SND_PCI_QUIRK(0x103c, 0x8b8a, "HP", ALC236_FIXUP_HP_GPIO_LED),
9440
9447
SND_PCI_QUIRK(0x103c, 0x8b8b, "HP", ALC236_FIXUP_HP_GPIO_LED),
9441
9448
SND_PCI_QUIRK(0x103c, 0x8b8d, "HP", ALC236_FIXUP_HP_GPIO_LED),
+4
-4
sound/soc/sof/intel/hda-dai.c
+4
-4
sound/soc/sof/intel/hda-dai.c
···
216
216
sdev = snd_soc_component_get_drvdata(cpu_dai->component);
217
217
bus = sof_to_bus(sdev);
218
218
219
+
hlink = snd_hdac_ext_bus_get_hlink_by_name(bus, codec_dai->component->name);
220
+
if (!hlink)
221
+
return -EINVAL;
222
+
219
223
hext_stream = snd_soc_dai_get_dma_data(cpu_dai, substream);
220
224
if (!hext_stream) {
221
225
hext_stream = hda_link_stream_assign(bus, substream);
···
228
224
229
225
snd_soc_dai_set_dma_data(cpu_dai, substream, (void *)hext_stream);
230
226
}
231
-
232
-
hlink = snd_hdac_ext_bus_get_hlink_by_name(bus, codec_dai->component->name);
233
-
if (!hlink)
234
-
return -EINVAL;
235
227
236
228
/* set the hdac_stream in the codec dai */
237
229
snd_soc_dai_set_stream(codec_dai, hdac_stream(hext_stream), substream->stream);