Commit 56e7a931 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v5.14-rc4' of... 

Merge tag 'asoc-fix-v5.14-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v5.14

Quite a lot of fixes here, the biggest set being for the cs42l42 driver
which is reasonably old but has seen a sudden uptick in activity.
There's also some fixes for correctly referencing PCM buffer addresses
and the removal of some driver-local bodges that had been done for the
lack of prefix handling in DAPM which were broken by the core handling
that as expected.
parents 97367c97 e5ada3f6

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -19992,7 +19992,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/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),

	},

sound/soc/amd/acp-pcm-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -969,7 +969,7 @@ static int acp_dma_hw_params(struct snd_soc_component *component, 


	acp_set_sram_bank_state(rtd->acp_mmio, 0, true);

	/* Save for runtime private data */

	rtd->dma_addr = substream->dma_buffer.addr;

	rtd->dma_addr = runtime->dma_addr;

	rtd->order = get_order(size);



	/* Fill the page table entries in ACP SRAM */

sound/soc/amd/raven/acp3x-pcm-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static int acp3x_dma_hw_params(struct snd_soc_component *component, 
		pr_err("pinfo failed\n");

	}

	size = params_buffer_bytes(params);

	rtd->dma_addr = substream->dma_buffer.addr;

	rtd->dma_addr = substream->runtime->dma_addr;

	rtd->num_pages = (PAGE_ALIGN(size) >> PAGE_SHIFT);

	config_acp3x_dma(rtd, substream->stream);

	return 0;