Unverified Commit ddaa1ed5 authored by Mark Brown's avatar Mark Brown
Browse files

Merge some cs42l42 patches into asoc-5.15

parents 585fb31c e2f68672

Documentation/devicetree/bindings/sound/renesas,rsnd.yaml

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ properties: 


  ports:

    $ref: /schemas/graph.yaml#/properties/ports

    properties:

    patternProperties:

      port(@[0-9a-f]+)?:

        $ref: audio-graph-port.yaml#

        unevaluatedProperties: false

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

include/sound/soc.h

+6 −0
Original line number Diff line number Diff line
@@ -712,6 +712,12 @@ struct snd_soc_dai_link { 
	/* Do not create a PCM for this DAI link (Backend link) */

	unsigned int ignore:1;



	/* This flag will reorder stop sequence. By enabling this flag

	 * DMA controller stop sequence will be invoked first followed by

	 * CPU DAI driver stop sequence

	 */

	unsigned int stop_dma_first:1;



#ifdef CONFIG_SND_SOC_TOPOLOGY

	struct snd_soc_dobj dobj; /* For topology */

#endif

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

+10 −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),

	},
@@ -576,6 +581,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { 
				| SND_SOC_DAIFMT_CBM_CFM,

		.init = cz_rt5682_init,

		.dpcm_playback = 1,

		.stop_dma_first = 1,

		.ops = &cz_rt5682_play_ops,

		SND_SOC_DAILINK_REG(designware1, rt5682, platform),

	},
@@ -585,6 +591,7 @@ static struct snd_soc_dai_link cz_dai_5682_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_rt5682_cap_ops,

		SND_SOC_DAILINK_REG(designware2, rt5682, platform),

	},
@@ -594,6 +601,7 @@ static struct snd_soc_dai_link cz_dai_5682_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_rt5682_max_play_ops,

		SND_SOC_DAILINK_REG(designware3, mx, platform),

	},
@@ -604,6 +612,7 @@ static struct snd_soc_dai_link cz_dai_5682_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_rt5682_dmic0_cap_ops,

		SND_SOC_DAILINK_REG(designware3, adau, platform),

	},
@@ -614,6 +623,7 @@ static struct snd_soc_dai_link cz_dai_5682_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_rt5682_dmic1_cap_ops,

		SND_SOC_DAILINK_REG(designware2, adau, platform),

	},