| Message ID | 20210504100424.8760-1-shumingf@realtek.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 682ae59ca2876f83396ccc5674235da99beed06c |
| Headers | show |
| Series | ASoC: rt711-sdca: fix the function number of SDCA control for feature unit 0x1E | expand |
On 5/4/21 5:04 AM, shumingf@realtek.com wrote: > From: Shuming Fan <shumingf@realtek.com> > > The function number should be FUNC_NUM_MIC_ARRAY(0x2) for the feature unit 0x1E. > > Signed-off-by: Shuming Fan <shumingf@realtek.com> This fixes the issue we saw, the test reports are fine with this patch. Thanks Shuming! BugLink: https://github.com/thesofproject/linux/issues/2877 Fixes: ca5118c0c00f6 ('ASoC: rt711-sdca: change capture switch controls') > --- > sound/soc/codecs/rt711-sdca.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sound/soc/codecs/rt711-sdca.c b/sound/soc/codecs/rt711-sdca.c > index cc36739f7fcf..24a084e0b48a 100644 > --- a/sound/soc/codecs/rt711-sdca.c > +++ b/sound/soc/codecs/rt711-sdca.c > @@ -683,13 +683,13 @@ static int rt711_sdca_set_fu1e_capture_ctl(struct rt711_sdca_priv *rt711) > ch_r = (rt711->fu1e_dapm_mute || rt711->fu1e_mixer_r_mute) ? 0x01 : 0x00; > > err = regmap_write(rt711->regmap, > - SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT711_SDCA_ENT_USER_FU1E, > + SDW_SDCA_CTL(FUNC_NUM_MIC_ARRAY, RT711_SDCA_ENT_USER_FU1E, > RT711_SDCA_CTL_FU_MUTE, CH_L), ch_l); > if (err < 0) > return err; > > err = regmap_write(rt711->regmap, > - SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT711_SDCA_ENT_USER_FU1E, > + SDW_SDCA_CTL(FUNC_NUM_MIC_ARRAY, RT711_SDCA_ENT_USER_FU1E, > RT711_SDCA_CTL_FU_MUTE, CH_R), ch_r); > if (err < 0) > return err; >
On Tue, 4 May 2021 18:04:24 +0800, shumingf@realtek.com wrote:
> The function number should be FUNC_NUM_MIC_ARRAY(0x2) for the feature unit 0x1E.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: rt711-sdca: fix the function number of SDCA control for feature unit 0x1E
commit: 682ae59ca2876f83396ccc5674235da99beed06c
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
diff --git a/sound/soc/codecs/rt711-sdca.c b/sound/soc/codecs/rt711-sdca.c index cc36739f7fcf..24a084e0b48a 100644 --- a/sound/soc/codecs/rt711-sdca.c +++ b/sound/soc/codecs/rt711-sdca.c @@ -683,13 +683,13 @@ static int rt711_sdca_set_fu1e_capture_ctl(struct rt711_sdca_priv *rt711) ch_r = (rt711->fu1e_dapm_mute || rt711->fu1e_mixer_r_mute) ? 0x01 : 0x00; err = regmap_write(rt711->regmap, - SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT711_SDCA_ENT_USER_FU1E, + SDW_SDCA_CTL(FUNC_NUM_MIC_ARRAY, RT711_SDCA_ENT_USER_FU1E, RT711_SDCA_CTL_FU_MUTE, CH_L), ch_l); if (err < 0) return err; err = regmap_write(rt711->regmap, - SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT711_SDCA_ENT_USER_FU1E, + SDW_SDCA_CTL(FUNC_NUM_MIC_ARRAY, RT711_SDCA_ENT_USER_FU1E, RT711_SDCA_CTL_FU_MUTE, CH_R), ch_r); if (err < 0) return err;