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

Merge tag 'asoc-fix-v6.8-rc2' of... 

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

ASoC: Fixes for v6.8

Quite a lot of fixes that came in since the merge window, a large
portion for for Qualcomm and ES8326.

The 8 DAI support for Qualcomm is just raising a constant to allow for
devies that otherwise only need DTs, and there's a few other device ID
updates for sunxi (Allwinner) and AMD platforms.
parents 2468e892 5513c5d0

Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml

+4 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ properties: 
      - const: allwinner,sun6i-a31-spdif

      - const: allwinner,sun8i-h3-spdif

      - const: allwinner,sun50i-h6-spdif

      - const: allwinner,sun50i-h616-spdif

      - items:

          - const: allwinner,sun8i-a83t-spdif

          - const: allwinner,sun8i-h3-spdif
@@ -62,6 +63,8 @@ allOf: 
            enum:

              - allwinner,sun6i-a31-spdif

              - allwinner,sun8i-h3-spdif

              - allwinner,sun50i-h6-spdif

              - allwinner,sun50i-h616-spdif



    then:

      required:
@@ -73,7 +76,7 @@ allOf: 
          contains:

            enum:

              - allwinner,sun8i-h3-spdif

              - allwinner,sun50i-h6-spdif

              - allwinner,sun50i-h616-spdif



    then:

      properties:

sound/soc/amd/acp/acp-mach-common.c

+14 −2
Original line number Diff line number Diff line
@@ -505,6 +505,13 @@ static int acp_card_rt5682s_hw_params(struct snd_pcm_substream *substream, 


	clk_set_rate(drvdata->wclk, srate);

	clk_set_rate(drvdata->bclk, srate * ch * format);

	if (!drvdata->soc_mclk) {

		ret = acp_clk_enable(drvdata, srate, ch * format);

		if (ret < 0) {

			dev_err(rtd->card->dev, "Failed to enable HS clk: %d\n", ret);

			return ret;

		}

	}



	return 0;

}
@@ -1464,8 +1471,13 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) 
	if (drv_data->amp_cpu_id == I2S_SP) {

		links[i].name = "acp-amp-codec";

		links[i].id = AMP_BE_ID;

		if (drv_data->platform == RENOIR) {

			links[i].cpus = sof_sp;

			links[i].num_cpus = ARRAY_SIZE(sof_sp);

		} else {

			links[i].cpus = sof_sp_virtual;

			links[i].num_cpus = ARRAY_SIZE(sof_sp_virtual);

		}

		links[i].platforms = sof_component;

		links[i].num_platforms = ARRAY_SIZE(sof_component);

		links[i].dpcm_playback = 1;

sound/soc/amd/acp/acp-sof-mach.c

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ static struct acp_card_drvdata sof_rt5682s_rt1019_data = { 
	.hs_codec_id = RT5682S,

	.amp_codec_id = RT1019,

	.dmic_codec_id = DMIC,

	.platform = RENOIR,

	.tdm_mode = false,

};
@@ -58,6 +59,7 @@ static struct acp_card_drvdata sof_rt5682s_max_data = { 
	.hs_codec_id = RT5682S,

	.amp_codec_id = MAX98360A,

	.dmic_codec_id = DMIC,

	.platform = RENOIR,

	.tdm_mode = false,

};
@@ -68,6 +70,7 @@ static struct acp_card_drvdata sof_nau8825_data = { 
	.hs_codec_id = NAU8825,

	.amp_codec_id = MAX98360A,

	.dmic_codec_id = DMIC,

	.platform = REMBRANDT,

	.soc_mclk = true,

	.tdm_mode = false,

};
@@ -79,6 +82,7 @@ static struct acp_card_drvdata sof_rt5682s_hs_rt1019_data = { 
	.hs_codec_id = RT5682S,

	.amp_codec_id = RT1019,

	.dmic_codec_id = DMIC,

	.platform = REMBRANDT,

	.soc_mclk = true,

	.tdm_mode = false,

};

sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c

+8 −0
Original line number Diff line number Diff line
@@ -354,6 +354,14 @@ static const struct dmi_system_id acp3x_es83xx_dmi_table[] = { 
		},

		.driver_data = (void *)(ES83XX_ENABLE_DMIC|ES83XX_48_MHZ_MCLK),

	},

	{

		.matches = {

			DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "HUAWEI"),

			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "HVY-WXX9"),

			DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "M1010"),

		},

		.driver_data = (void *)(ES83XX_ENABLE_DMIC),

	},

	{

		.matches = {

			DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "HUAWEI"),

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

+7 −0
Original line number Diff line number Diff line
@@ -297,6 +297,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "Bravo 15 B7ED"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "Micro-Star International Co., Ltd."),

			DMI_MATCH(DMI_PRODUCT_NAME, "Bravo 15 C7VF"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {