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

Merge tag 'asoc-fix-v6.1-rc6' of... 

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

ASoC: Fixes for v6.1

A clutch of small fixes that have come in in the past week, people seem
to have been unusually active for this late in the release cycle.  The
most critical one here is the fix to renumber the SOF DAI types in order
to restore ABI compatibility which was broken by the addition of AMD
support.
parents 05530ef7 db8f91d4

include/sound/sof/dai.h

+1 −1
Original line number Diff line number Diff line
@@ -84,8 +84,8 @@ enum sof_ipc_dai_type { 
	SOF_DAI_AMD_BT,			/**< AMD ACP BT*/

	SOF_DAI_AMD_SP,			/**< AMD ACP SP */

	SOF_DAI_AMD_DMIC,		/**< AMD ACP DMIC */

	SOF_DAI_AMD_HS,			/**< Amd HS */

	SOF_DAI_MEDIATEK_AFE,		/**< Mediatek AFE */

	SOF_DAI_AMD_HS,			/**< Amd HS */

};



/* general purpose DAI configuration */

sound/soc/codecs/hdac_hda.h

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ enum { 
	HDAC_HDMI_1_DAI_ID,

	HDAC_HDMI_2_DAI_ID,

	HDAC_HDMI_3_DAI_ID,

	HDAC_LAST_DAI_ID = HDAC_HDMI_3_DAI_ID,

	HDAC_DAI_ID_NUM

};



struct hdac_hda_pcm {
@@ -24,7 +24,7 @@ struct hdac_hda_pcm { 


struct hdac_hda_priv {

	struct hda_codec *codec;

	struct hdac_hda_pcm pcm[HDAC_LAST_DAI_ID];

	struct hdac_hda_pcm pcm[HDAC_DAI_ID_NUM];

	bool need_display_power;

};

sound/soc/codecs/max98373-i2c.c

+4 −0
Original line number Diff line number Diff line
@@ -549,6 +549,10 @@ static int max98373_i2c_probe(struct i2c_client *i2c) 
	max98373->cache = devm_kcalloc(&i2c->dev, max98373->cache_num,

				       sizeof(*max98373->cache),

				       GFP_KERNEL);

	if (!max98373->cache) {

		ret = -ENOMEM;

		return ret;

	}



	for (i = 0; i < max98373->cache_num; i++)

		max98373->cache[i].reg = max98373_i2c_cache_reg[i];

sound/soc/codecs/rt711-sdca-sdw.c

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static int rt711_sdca_read_prop(struct sdw_slave *slave) 
	}



	/* set the timeout values */

	prop->clk_stop_timeout = 20;

	prop->clk_stop_timeout = 700;



	/* wake-up event */

	prop->wake_capable = 1;

sound/soc/codecs/sgtl5000.c

+1 −0
Original line number Diff line number Diff line
@@ -1794,6 +1794,7 @@ static void sgtl5000_i2c_remove(struct i2c_client *client) 
{

	struct sgtl5000_priv *sgtl5000 = i2c_get_clientdata(client);



	regmap_write(sgtl5000->regmap, SGTL5000_CHIP_CLK_CTRL, SGTL5000_CHIP_CLK_CTRL_DEFAULT);

	regmap_write(sgtl5000->regmap, SGTL5000_CHIP_DIG_POWER, SGTL5000_DIG_POWER_DEFAULT);

	regmap_write(sgtl5000->regmap, SGTL5000_CHIP_ANA_POWER, SGTL5000_ANA_POWER_DEFAULT);