Commit 59cd4f43 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-5.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "This seems to be a usual bump in the middle, containing lots of
  pending ASoC fixes:

   - Yet another PCM mmap regression fix

   - Fix for ASoC DAPM prefix handling

   - Various cs42l42 codec fixes

   - PCM buffer reference fixes in a few ASoC drivers

   - Fixes for ASoC SOF, AMD, tlv320, WM

   - HD-audio quirks"

* tag 'sound-5.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (32 commits)
  ALSA: hda/realtek: fix mute/micmute LEDs for HP ProBook 650 G8 Notebook PC
  ALSA: pcm: Fix mmap breakage without explicit buffer setup
  ALSA: hda: Add quirk for ASUS Flow x13
  ASoC: cs42l42: Fix mono playback
  ASoC: cs42l42: Constrain sample rate to prevent illegal SCLK
  ASoC: cs42l42: Fix LRCLK frame start edge
  ASoC: cs42l42: PLL must be running when changing MCLK_SRC_SEL
  ASoC: cs42l42: Remove duplicate control for WNF filter frequency
  ASoC: cs42l42: Fix inversion of ADC Notch Switch control
  ASoC: SOF: Intel: hda-ipc: fix reply size checking
  ASoC: SOF: Intel: Kconfig: fix SoundWire dependencies
  ASoC: amd: Fix reference to PCM buffer address
  ASoC: nau8824: Fix open coded prefix handling
  ASoC: kirkwood: Fix reference to PCM buffer address
  ASoC: uniphier: Fix reference to PCM buffer address
  ASoC: xilinx: Fix reference to PCM buffer address
  ASoC: intel: atom: Fix reference to PCM buffer address
  ASoC: cs42l42: Fix bclk calculation for mono
  ASoC: cs42l42: Don't allow SND_SOC_DAIFMT_LEFT_J
  ASoC: cs42l42: Correct definition of ADC Volume control
  ...
parents 1746f4db d07149ab

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -20017,7 +20017,8 @@ F: Documentation/devicetree/bindings/extcon/wlf,arizona.yaml 
F:	Documentation/devicetree/bindings/mfd/wlf,arizona.yaml

F:	Documentation/devicetree/bindings/mfd/wm831x.txt

F:	Documentation/devicetree/bindings/regulator/wlf,arizona.yaml

F:	Documentation/devicetree/bindings/sound/wlf,arizona.yaml

F:	Documentation/devicetree/bindings/sound/wlf,*.yaml

F:	Documentation/devicetree/bindings/sound/wm*

F:	Documentation/hwmon/wm83??.rst

F:	arch/arm/mach-s3c/mach-crag6410*

F:	drivers/clk/clk-wm83*.c

sound/core/pcm_native.c

+4 −1
Original line number Diff line number Diff line
@@ -251,7 +251,10 @@ static bool hw_support_mmap(struct snd_pcm_substream *substream) 


	switch (substream->dma_buffer.dev.type) {

	case SNDRV_DMA_TYPE_UNKNOWN:

		return false;

		/* we can't know the device, so just assume that the driver does

		 * everything right

		 */

		return true;

	case SNDRV_DMA_TYPE_CONTINUOUS:

	case SNDRV_DMA_TYPE_VMALLOC:

		return true;

sound/pci/hda/patch_realtek.c

+2 −0
Original line number Diff line number Diff line
@@ -8431,6 +8431,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x87f4, "HP", ALC287_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x87f5, "HP", ALC287_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x87f7, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP),

	SND_PCI_QUIRK(0x103c, 0x8805, "HP ProBook 650 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x880d, "HP EliteBook 830 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8846, "HP EliteBook 850 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8847, "HP EliteBook x360 830 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
@@ -8465,6 +8466,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK(0x1043, 0x1740, "ASUS UX430UA", ALC295_FIXUP_ASUS_DACS),

	SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_DUAL_SPK),

	SND_PCI_QUIRK(0x1043, 0x1662, "ASUS GV301QH", ALC294_FIXUP_ASUS_DUAL_SPK),

	SND_PCI_QUIRK(0x1043, 0x1881, "ASUS Zephyrus S/M", ALC294_FIXUP_ASUS_GX502_PINS),

	SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC),

	SND_PCI_QUIRK(0x1043, 0x18f1, "Asus FX505DT", ALC256_FIXUP_ASUS_HEADSET_MIC),

sound/soc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ config SND_SOC_COMPRESS 


config SND_SOC_TOPOLOGY

	bool

	select SND_DYNAMIC_MINORS



config SND_SOC_TOPOLOGY_KUNIT_TEST

	tristate "KUnit tests for SoC topology"

sound/soc/amd/acp-da7219-max98357a.c

+5 −0
Original line number Diff line number Diff line
@@ -525,6 +525,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { 
				| SND_SOC_DAIFMT_CBM_CFM,

		.init = cz_da7219_init,

		.dpcm_playback = 1,

		.stop_dma_first = 1,

		.ops = &cz_da7219_play_ops,

		SND_SOC_DAILINK_REG(designware1, dlgs, platform),

	},
@@ -534,6 +535,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { 
		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF

				| SND_SOC_DAIFMT_CBM_CFM,

		.dpcm_capture = 1,

		.stop_dma_first = 1,

		.ops = &cz_da7219_cap_ops,

		SND_SOC_DAILINK_REG(designware2, dlgs, platform),

	},
@@ -543,6 +545,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { 
		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF

				| SND_SOC_DAIFMT_CBM_CFM,

		.dpcm_playback = 1,

		.stop_dma_first = 1,

		.ops = &cz_max_play_ops,

		SND_SOC_DAILINK_REG(designware3, mx, platform),

	},
@@ -553,6 +556,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { 
		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF

				| SND_SOC_DAIFMT_CBM_CFM,

		.dpcm_capture = 1,

		.stop_dma_first = 1,

		.ops = &cz_dmic0_cap_ops,

		SND_SOC_DAILINK_REG(designware3, adau, platform),

	},
@@ -563,6 +567,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { 
		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF

				| SND_SOC_DAIFMT_CBM_CFM,

		.dpcm_capture = 1,

		.stop_dma_first = 1,

		.ops = &cz_dmic1_cap_ops,

		SND_SOC_DAILINK_REG(designware2, adau, platform),

	},