Commit 3a4c1551 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.6-rc5' of... 

Merge tag 'asoc-fix-v6.6-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: More fixes for v6.6

Some additional fixes for v6.6, some fairly unremarkable driver specific
ones and a couple of minor core fixes for error handling and improved
logging.
parents ccbd88be 1426b9ba

Documentation/devicetree/bindings/sound/fsl,micfil.yaml

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ properties: 
      - const: clkext3

    minItems: 2



  "#sound-dai-cells":

    const: 0



required:

  - compatible

  - reg

include/sound/soc.h

+2 −0
Original line number Diff line number Diff line
@@ -1126,6 +1126,8 @@ struct snd_soc_pcm_runtime { 
	unsigned int pop_wait:1;

	unsigned int fe_compr:1; /* for Dynamic PCM */



	bool initialized;



	int num_components;

	struct snd_soc_component *components[]; /* CPU/Codec/Platform */

};

sound/soc/amd/yc/acp6x-mach.c

+7 −0
Original line number Diff line number Diff line
@@ -241,6 +241,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "82V2"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "82YM"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

sound/soc/codecs/hdmi-codec.c

+4 −1
Original line number Diff line number Diff line
@@ -531,7 +531,10 @@ static int hdmi_codec_fill_codec_params(struct snd_soc_dai *dai, 
	hp->sample_rate = sample_rate;

	hp->channels = channels;



	hcp->chmap_idx = idx;

	if (pcm_audio)

		hcp->chmap_idx = ca_id;

	else

		hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN;



	return 0;

}

sound/soc/codecs/rt5682-i2c.c

+5 −5
Original line number Diff line number Diff line
@@ -157,11 +157,6 @@ static int rt5682_i2c_probe(struct i2c_client *i2c) 
		return ret;

	}



	ret = devm_add_action_or_reset(&i2c->dev, rt5682_i2c_disable_regulators,

				       rt5682);

	if (ret)

		return ret;



	ret = regulator_bulk_enable(ARRAY_SIZE(rt5682->supplies),

				    rt5682->supplies);

	if (ret) {
@@ -169,6 +164,11 @@ static int rt5682_i2c_probe(struct i2c_client *i2c) 
		return ret;

	}



	ret = devm_add_action_or_reset(&i2c->dev, rt5682_i2c_disable_regulators,

				       rt5682);

	if (ret)

		return ret;



	ret = rt5682_get_ldo1(rt5682, &i2c->dev);

	if (ret)

		return ret;