Unverified Commit 70d1d303 authored by Trevor Wu's avatar Trevor Wu Committed by Mark Brown
Browse files

ASoC: mediatek: mt8188: correct etdm control return value 



In mt8188_etdm_clk_src_sel_put() function, val retrieved by FIELD_PREP
is shifted to the corresponding bit filed, so it can compare with the
register value directly.

Originally, the redundant bit shift of the register value results in
the wrong comparison result, so we remove bit shift operation in the
patch.

Fixes: 2babb477 ("ASoC: mediatek: mt8188: support etdm in platform driver")
Signed-off-by: default avatarTrevor Wu <trevor.wu@mediatek.com>
Link: https://lore.kernel.org/r/20230215125017.16044-1-trevor.wu@mediatek.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 51c58a1e

sound/soc/mediatek/mt8188/mt8188-dai-etdm.c

+0 −8
Original line number Diff line number Diff line
@@ -679,7 +679,6 @@ static int mt8188_etdm_clk_src_sel_put(struct snd_kcontrol *kcontrol, 
	unsigned int old_val;

	unsigned int mask;

	unsigned int reg;

	unsigned int shift;



	if (source >= e->items)

		return -EINVAL;
@@ -687,27 +686,22 @@ static int mt8188_etdm_clk_src_sel_put(struct snd_kcontrol *kcontrol, 
	if (!strcmp(kcontrol->id.name, "ETDM_OUT1_Clock_Source")) {

		reg = ETDM_OUT1_CON4;

		mask = ETDM_OUT_CON4_CLOCK_MASK;

		shift = ETDM_OUT_CON4_CLOCK_SHIFT;

		val = FIELD_PREP(ETDM_OUT_CON4_CLOCK_MASK, source);

	} else if (!strcmp(kcontrol->id.name, "ETDM_OUT2_Clock_Source")) {

		reg = ETDM_OUT2_CON4;

		mask = ETDM_OUT_CON4_CLOCK_MASK;

		shift = ETDM_OUT_CON4_CLOCK_SHIFT;

		val = FIELD_PREP(ETDM_OUT_CON4_CLOCK_MASK, source);

	} else if (!strcmp(kcontrol->id.name, "ETDM_OUT3_Clock_Source")) {

		reg = ETDM_OUT3_CON4;

		mask = ETDM_OUT_CON4_CLOCK_MASK;

		shift = ETDM_OUT_CON4_CLOCK_SHIFT;

		val = FIELD_PREP(ETDM_OUT_CON4_CLOCK_MASK, source);

	} else if (!strcmp(kcontrol->id.name, "ETDM_IN1_Clock_Source")) {

		reg = ETDM_IN1_CON2;

		mask = ETDM_IN_CON2_CLOCK_MASK;

		shift = ETDM_IN_CON2_CLOCK_SHIFT;

		val = FIELD_PREP(ETDM_IN_CON2_CLOCK_MASK, source);

	} else if (!strcmp(kcontrol->id.name, "ETDM_IN2_Clock_Source")) {

		reg = ETDM_IN2_CON2;

		mask = ETDM_IN_CON2_CLOCK_MASK;

		shift = ETDM_IN_CON2_CLOCK_SHIFT;

		val = FIELD_PREP(ETDM_IN_CON2_CLOCK_MASK, source);

	} else {

		return -EINVAL;
@@ -715,8 +709,6 @@ static int mt8188_etdm_clk_src_sel_put(struct snd_kcontrol *kcontrol, 


	regmap_read(afe->regmap, reg, &old_val);

	old_val &= mask;

	old_val >>= shift;



	if (old_val == val)

		return 0;