Commit 0d57ed92 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.16-rc7' of... 

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

ASoC: Fixes for v6.16

A few device specific fixes, none especially remarkable though all
useful.
parents 931837cd 696e123a

sound/soc/codecs/rt5645.c

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ static const struct reg_sequence rt5650_init_list[] = { 
	{0xf6,	0x0100},

	{RT5645_PWR_ANLG1, 0x02},

	{RT5645_IL_CMD3, 0x6728},

	{RT5645_PR_BASE + 0x3a,	0x0000},

};



static const struct reg_default rt5645_reg[] = {

sound/soc/mediatek/common/mtk-soundcard-driver.c

+4 −0
Original line number Diff line number Diff line
@@ -262,9 +262,13 @@ int mtk_soundcard_common_probe(struct platform_device *pdev) 
				soc_card_data->accdet = accdet_comp;

			else

				dev_err(&pdev->dev, "No sound component found from mediatek,accdet property\n");



			put_device(&accdet_pdev->dev);

		} else {

			dev_err(&pdev->dev, "No device found from mediatek,accdet property\n");

		}



		of_node_put(accdet_node);

	}



	platform_node = of_parse_phandle(pdev->dev.of_node, "mediatek,platform", 0);

sound/soc/mediatek/mt8365/mt8365-dai-i2s.c

+1 −2
Original line number Diff line number Diff line
@@ -812,11 +812,10 @@ static const struct snd_soc_dapm_route mtk_dai_i2s_routes[] = { 
static int mt8365_dai_i2s_set_priv(struct mtk_base_afe *afe)

{

	int i, ret;

	struct mt8365_afe_private *afe_priv = afe->platform_priv;



	for (i = 0; i < DAI_I2S_NUM; i++) {

		ret = mt8365_dai_set_priv(afe, mt8365_i2s_priv[i].id,

					  sizeof(*afe_priv),

					  sizeof(mt8365_i2s_priv[i]),

					  &mt8365_i2s_priv[i]);

		if (ret)

			return ret;

sound/soc/sdca/sdca_functions.c

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static int find_sdca_init_table(struct device *dev, 
	} else if (num_init_writes % sizeof(*raw) != 0) {

		dev_err(dev, "%pfwP: init table size invalid\n", function_node);

		return -EINVAL;

	} else if (num_init_writes > SDCA_MAX_INIT_COUNT) {

	} else if ((num_init_writes / sizeof(*raw)) > SDCA_MAX_INIT_COUNT) {

		dev_err(dev, "%pfwP: maximum init table size exceeded\n", function_node);

		return -EINVAL;

	}

sound/soc/sof/intel/ptl.c

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ const struct sof_intel_dsp_desc ptl_chip_info = { 
	.read_sdw_lcount =  hda_sdw_check_lcount_ext,

	.check_sdw_irq = lnl_dsp_check_sdw_irq,

	.check_sdw_wakeen_irq = lnl_sdw_check_wakeen_irq,

	.sdw_process_wakeen = hda_sdw_process_wakeen_common,

	.check_ipc_irq = mtl_dsp_check_ipc_irq,

	.check_mic_privacy_irq = sof_ptl_check_mic_privacy_irq,

	.process_mic_privacy = sof_ptl_process_mic_privacy,