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

Commit fe8e9fdf authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Greg Kroah-Hartman
Browse files

ASoC: samsung: i2s: Fix prescaler setting for the secondary DAI 



[ Upstream commit 323fb7b947b265753de34703dbbf8acc8ea3a4de ]

Make sure i2s->rclk_srcrate is properly initialized also during
playback through the secondary DAI.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 66bccc6a

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);