Commit 03dad2f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4b89ca5a e97fc9cf

sound/pci/hda/hda_codec.c

+1 −1
Original line number Diff line number Diff line
@@ -927,7 +927,6 @@ snd_hda_codec_device_init(struct hda_bus *bus, unsigned int codec_addr, 
	codec->depop_delay = -1;

	codec->fixup_id = HDA_FIXUP_ID_NOT_SET;

	codec->core.dev.release = snd_hda_codec_dev_release;

	codec->core.exec_verb = codec_exec_verb;

	codec->core.type = HDA_DEV_LEGACY;



	mutex_init(&codec->spdif_mutex);
@@ -998,6 +997,7 @@ int snd_hda_codec_device_new(struct hda_bus *bus, struct snd_card *card, 
	if (snd_BUG_ON(codec_addr > HDA_MAX_CODEC_ADDRESS))

		return -EINVAL;



	codec->core.exec_verb = codec_exec_verb;

	codec->card = card;

	codec->addr = codec_addr;

sound/pci/hda/patch_conexant.c

+1 −0
Original line number Diff line number Diff line
@@ -1125,6 +1125,7 @@ static const struct hda_device_id snd_hda_id_conexant[] = { 
	HDA_CODEC_ENTRY(0x14f11f87, "SN6140", patch_conexant_auto),

	HDA_CODEC_ENTRY(0x14f12008, "CX8200", patch_conexant_auto),

	HDA_CODEC_ENTRY(0x14f120d0, "CX11970", patch_conexant_auto),

	HDA_CODEC_ENTRY(0x14f120d1, "SN6180", patch_conexant_auto),

	HDA_CODEC_ENTRY(0x14f15045, "CX20549 (Venice)", patch_conexant_auto),

	HDA_CODEC_ENTRY(0x14f15047, "CX20551 (Waikiki)", patch_conexant_auto),

	HDA_CODEC_ENTRY(0x14f15051, "CX20561 (Hermosa)", patch_conexant_auto),

sound/pci/hda/patch_realtek.c

+8 −1
Original line number Diff line number Diff line
@@ -832,7 +832,7 @@ static int alc_subsystem_id(struct hda_codec *codec, const hda_nid_t *ports) 
			alc_setup_gpio(codec, 0x02);

			break;

		case 7:

			alc_setup_gpio(codec, 0x03);

			alc_setup_gpio(codec, 0x04);

			break;

		case 5:

		default:
@@ -9432,10 +9432,17 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	 SND_PCI_QUIRK(0x103c, 0x8abb, "HP ZBook Firefly 14 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8ad1, "HP EliteBook 840 14 inch G9 Notebook PC", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8ad2, "HP EliteBook 860 16 inch G9 Notebook PC", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8b42, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8b43, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8b44, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8b45, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8b46, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8b47, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8b5d, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),

	SND_PCI_QUIRK(0x103c, 0x8b5e, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),

	SND_PCI_QUIRK(0x103c, 0x8b7a, "HP", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8b7d, "HP", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8b87, "HP", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8b8a, "HP", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8b8b, "HP", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8b8d, "HP", ALC236_FIXUP_HP_GPIO_LED),

sound/soc/sof/intel/hda-dai.c

+4 −4
Original line number Diff line number Diff line
@@ -216,6 +216,10 @@ static int hda_link_dma_hw_params(struct snd_pcm_substream *substream, 
	sdev = snd_soc_component_get_drvdata(cpu_dai->component);

	bus = sof_to_bus(sdev);



	hlink = snd_hdac_ext_bus_get_hlink_by_name(bus, codec_dai->component->name);

	if (!hlink)

		return -EINVAL;



	hext_stream = snd_soc_dai_get_dma_data(cpu_dai, substream);

	if (!hext_stream) {

		hext_stream = hda_link_stream_assign(bus, substream);
@@ -225,10 +229,6 @@ static int hda_link_dma_hw_params(struct snd_pcm_substream *substream, 
		snd_soc_dai_set_dma_data(cpu_dai, substream, (void *)hext_stream);

	}



	hlink = snd_hdac_ext_bus_get_hlink_by_name(bus, codec_dai->component->name);

	if (!hlink)

		return -EINVAL;



	/* set the hdac_stream in the codec dai */

	snd_soc_dai_set_stream(codec_dai, hdac_stream(hext_stream), substream->stream);

sound/soc/sof/ops.h

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ static inline u64 snd_sof_dsp_read64(struct snd_sof_dev *sdev, u32 bar, 
}



static inline void snd_sof_dsp_update8(struct snd_sof_dev *sdev, u32 bar,

				       u32 offset, u8 value, u8 mask)

				       u32 offset, u8 mask, u8 value)

{

	u8 reg;