Commit 234d8f27 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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

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

ASoC: Fixes for v5.14

A collection of fixes for ASoC that have come in since the merge window,
all driver specific.  There is a new core feature added for reversing
the order of operations when shutting down, this is needed to fix a bug
with the AMD Stonyridge platform, and we also tweak the Kconfig to make
the SSM2518 driver user selectable so it can be used with generic cards
but that requires no actual code changes.
parents e81d71e3 82d28b67

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

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/amd/acp-da7219-max98357a.c

+5 −0
Original line number Diff line number Diff line
@@ -576,6 +576,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 +586,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 +596,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 +607,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 +618,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),

	},

sound/soc/codecs/Kconfig

+2 −6
Original line number Diff line number Diff line
@@ -1325,7 +1325,7 @@ config SND_SOC_SSM2305 
	  high-efficiency mono Class-D audio power amplifiers.



config SND_SOC_SSM2518

	tristate

	tristate "Analog Devices SSM2518 Class-D Amplifier"

	depends on I2C



config SND_SOC_SSM2602
@@ -1557,6 +1557,7 @@ config SND_SOC_WCD934X 
	  Qualcomm SoCs like SDM845.



config SND_SOC_WCD938X

	depends on SND_SOC_WCD938X_SDW

	tristate



config SND_SOC_WCD938X_SDW
@@ -1813,11 +1814,6 @@ config SND_SOC_ZL38060 
	  which consists of a Digital Signal Processor (DSP), several Digital

	  Audio Interfaces (DAIs), analog outputs, and a block of 14 GPIOs.



config SND_SOC_ZX_AUD96P22

	tristate "ZTE ZX AUD96P22 CODEC"

	depends on I2C

	select REGMAP_I2C



# Amp

config SND_SOC_LM4857

	tristate

sound/soc/codecs/rt5631.c

+2 −0
Original line number Diff line number Diff line
@@ -1695,6 +1695,8 @@ static const struct regmap_config rt5631_regmap_config = { 
	.reg_defaults = rt5631_reg,

	.num_reg_defaults = ARRAY_SIZE(rt5631_reg),

	.cache_type = REGCACHE_RBTREE,

	.use_single_read = true,

	.use_single_write = true,

};



static int rt5631_i2c_probe(struct i2c_client *i2c,