Commit e8b96a66 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.11-merge-window' of... 

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

ASoC: Fixes for v6.11

A selection of routine fixes and quirks that came in since the merge
window.  The fsl-asoc-card change is a fix for systems with multiple
cards where updating templates in place leaks data from one card to
another.
parents dcfed708 ab53dfdc

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

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

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "21M5"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

sound/soc/codecs/tas2781-fmwlib.c

+1 −1
Original line number Diff line number Diff line
@@ -2162,7 +2162,7 @@ static void tasdev_load_calibrated_data(struct tasdevice_priv *priv, int i) 
		return;



	cal = cal_fmw->calibrations;

	if (cal)

	if (!cal)

		return;



	load_calib_data(priv, &cal->dev_data);

sound/soc/fsl/fsl-asoc-card.c

+29 −17
Original line number Diff line number Diff line
@@ -306,27 +306,12 @@ static int be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
	return 0;

}



SND_SOC_DAILINK_DEFS(hifi,

	DAILINK_COMP_ARRAY(COMP_EMPTY()),

	DAILINK_COMP_ARRAY(COMP_EMPTY(), COMP_EMPTY()),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



SND_SOC_DAILINK_DEFS(hifi_fe,

	DAILINK_COMP_ARRAY(COMP_EMPTY()),

	DAILINK_COMP_ARRAY(COMP_DUMMY()),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



SND_SOC_DAILINK_DEFS(hifi_be,

	DAILINK_COMP_ARRAY(COMP_EMPTY()),

	DAILINK_COMP_ARRAY(COMP_EMPTY(), COMP_EMPTY()));



static const struct snd_soc_dai_link fsl_asoc_card_dai[] = {

	/* Default ASoC DAI Link*/

	{

		.name = "HiFi",

		.stream_name = "HiFi",

		.ops = &fsl_asoc_card_ops,

		SND_SOC_DAILINK_REG(hifi),

	},

	/* DPCM Link between Front-End and Back-End (Optional) */

	{
@@ -335,7 +320,6 @@ static const struct snd_soc_dai_link fsl_asoc_card_dai[] = { 
		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.dynamic = 1,

		SND_SOC_DAILINK_REG(hifi_fe),

	},

	{

		.name = "HiFi-ASRC-BE",
@@ -345,7 +329,6 @@ static const struct snd_soc_dai_link fsl_asoc_card_dai[] = { 
		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.no_pcm = 1,

		SND_SOC_DAILINK_REG(hifi_be),

	},

};
@@ -637,6 +620,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
	struct platform_device *cpu_pdev;

	struct fsl_asoc_card_priv *priv;

	struct device *codec_dev[2] = { NULL, NULL };

	struct snd_soc_dai_link_component *dlc;

	const char *codec_dai_name[2];

	const char *codec_dev_name[2];

	u32 asrc_fmt = 0;
@@ -717,7 +701,35 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 


	memcpy(priv->dai_link, fsl_asoc_card_dai,

	       sizeof(struct snd_soc_dai_link) * ARRAY_SIZE(priv->dai_link));

	/*

	 * "Default ASoC DAI Link": 1 cpus, 2 codecs, 1 platforms

	 * "DPCM Link Front-End":  1 cpus, 1 codecs (dummy), 1 platforms

	 * "DPCM Link Back-End": 1 cpus, 2 codecs

	 * totally 10 components

	 */

	dlc = devm_kcalloc(&pdev->dev, 10, sizeof(*dlc), GFP_KERNEL);

	if (!dlc) {

		ret = -ENOMEM;

		goto asrc_fail;

	}



	priv->dai_link[0].cpus = &dlc[0];

	priv->dai_link[0].num_cpus = 1;

	priv->dai_link[0].codecs = &dlc[1];

	priv->dai_link[0].num_codecs = 1;

	priv->dai_link[0].platforms = &dlc[3];

	priv->dai_link[0].num_platforms = 1;



	priv->dai_link[1].cpus = &dlc[4];

	priv->dai_link[1].num_cpus = 1;

	priv->dai_link[1].codecs = &dlc[5];

	priv->dai_link[1].num_codecs = 0; /* dummy */

	priv->dai_link[1].platforms = &dlc[6];

	priv->dai_link[1].num_platforms = 1;



	priv->dai_link[2].cpus = &dlc[7];

	priv->dai_link[2].num_cpus = 1;

	priv->dai_link[2].codecs = &dlc[8];

	priv->dai_link[2].num_codecs = 1;



	priv->card.dapm_routes = audio_map;

sound/soc/intel/common/soc-acpi-intel-ssp-common.c

+9 −0
Original line number Diff line number Diff line
@@ -64,6 +64,15 @@ static const struct codec_map amps[] = { 
	CODEC_MAP_ENTRY("RT1015P", "rt1015", RT1015P_ACPI_HID, CODEC_RT1015P),

	CODEC_MAP_ENTRY("RT1019P", "rt1019", RT1019P_ACPI_HID, CODEC_RT1019P),

	CODEC_MAP_ENTRY("RT1308", "rt1308", RT1308_ACPI_HID, CODEC_RT1308),



	/*

	 * Monolithic components

	 *

	 * Only put components that can serve as both the amp and the codec below this line.

	 * This will ensure that if the part is used just as a codec and there is an amp as well

	 * then the amp will be selected properly.

	 */

	CODEC_MAP_ENTRY("RT5650", "rt5650", RT5650_ACPI_HID, CODEC_RT5650),

};



enum snd_soc_acpi_intel_codec

sound/soc/intel/common/soc-intel-quirks.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


#include <linux/platform_data/x86/soc.h>



#if IS_ENABLED(CONFIG_X86)

#if IS_REACHABLE(CONFIG_IOSF_MBI)



#include <linux/dmi.h>

#include <asm/iosf_mbi.h>