Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'asoc-fix-v5.0-rc6' of... 

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

ASoC: Fixes for v5.0

A few small fixes, a driver fix for Samsung, a fix for refcounting of
of_nodes in the simple-card driver that triggered on a lot of systems
and a fix for topology error handling.
parents c8c6ee61 19dd0777

sound/soc/generic/simple-card.c

+1 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ static int asoc_simple_card_parse_of(struct simple_card_data *priv) 
	conf_idx	= 0;

	node = of_get_child_by_name(top, PREFIX "dai-link");

	if (!node) {

		node = dev->of_node;

		node = of_node_get(top);

		loop = 0;

	}

sound/soc/samsung/i2s.c

+7 −1
Original line number Diff line number Diff line
@@ -604,6 +604,7 @@ static int i2s_set_fmt(struct snd_soc_dai *dai, 
	unsigned int fmt)

{

	struct i2s_dai *i2s = to_info(dai);

	struct i2s_dai *other = get_other_dai(i2s);

	int lrp_shift, sdf_shift, sdf_mask, lrp_rlow, mod_slave;

	u32 mod, tmp = 0;

	unsigned long flags;
@@ -661,7 +662,8 @@ static int i2s_set_fmt(struct snd_soc_dai *dai, 
		 * CLK_I2S_RCLK_SRC clock is not exposed so we ensure any

		 * clock configuration assigned in DT is not overwritten.

		 */

		if (i2s->rclk_srcrate == 0 && i2s->clk_data.clks == NULL)

		if (i2s->rclk_srcrate == 0 && i2s->clk_data.clks == NULL &&

		    other->clk_data.clks == NULL)

			i2s_set_sysclk(dai, SAMSUNG_I2S_RCLKSRC_0,

							0, SND_SOC_CLOCK_IN);

		break;
@@ -699,6 +701,7 @@ static int i2s_hw_params(struct snd_pcm_substream *substream, 
	struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)

{

	struct i2s_dai *i2s = to_info(dai);

	struct i2s_dai *other = get_other_dai(i2s);

	u32 mod, mask = 0, val = 0;

	struct clk *rclksrc;

	unsigned long flags;
@@ -784,6 +787,9 @@ static int i2s_hw_params(struct snd_pcm_substream *substream, 
	i2s->frmclk = params_rate(params);



	rclksrc = i2s->clk_table[CLK_I2S_RCLK_SRC];

	if (!rclksrc || IS_ERR(rclksrc))

		rclksrc = other->clk_table[CLK_I2S_RCLK_SRC];



	if (rclksrc && !IS_ERR(rclksrc))

		i2s->rclk_srcrate = clk_get_rate(rclksrc);

sound/soc/soc-topology.c

+7 −1
Original line number Diff line number Diff line
@@ -2487,6 +2487,7 @@ int snd_soc_tplg_component_load(struct snd_soc_component *comp, 
	struct snd_soc_tplg_ops *ops, const struct firmware *fw, u32 id)

{

	struct soc_tplg tplg;

	int ret;



	/* setup parsing context */

	memset(&tplg, 0, sizeof(tplg));
@@ -2500,7 +2501,12 @@ int snd_soc_tplg_component_load(struct snd_soc_component *comp, 
	tplg.bytes_ext_ops = ops->bytes_ext_ops;

	tplg.bytes_ext_ops_count = ops->bytes_ext_ops_count;



	return soc_tplg_load(&tplg);

	ret = soc_tplg_load(&tplg);

	/* free the created components if fail to load topology */

	if (ret)

		snd_soc_tplg_component_remove(comp, SND_SOC_TPLG_INDEX_ALL);



	return ret;

}

EXPORT_SYMBOL_GPL(snd_soc_tplg_component_load);