diff mbox series

ASoC: mediatek: mt8183-da7219: fix wrong ops for I2S3

Message ID 20201006101252.1890385-1-tzungbi@google.com (mailing list archive)
State Accepted
Commit ebb11d1d9fe2d6b4a47755f7f09b2b631046e308
Headers show
Series ASoC: mediatek: mt8183-da7219: fix wrong ops for I2S3 | expand

Commit Message

Tzung-Bi Shih Oct. 6, 2020, 10:12 a.m. UTC
DA7219 uses I2S2 and I2S3 for input and output respectively.  Commit
9e30251fb22e ("ASoC: mediatek: mt8183-da7219: support machine driver
with rt1015") introduces a bug that:
- If using I2S2 solely, MCLK to DA7219 is 256FS.
- If using I2S3 solely, MCLK to DA7219 is 128FS.
- If using I2S3 first and then I2S2, the MCLK changes from 128FS to
  256FS.  As a result, no sound output to the headset.  Also no sound
  input from the headset microphone.

Both I2S2 and I2S3 should set MCLK to 256FS.  Fixes the wrong ops for
I2S3.

Fixes: 9e30251fb22e ("ASoC: mediatek: mt8183-da7219: support machine driver with rt1015")
Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
---
 sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mark Brown Oct. 6, 2020, 3:20 p.m. UTC | #1
On Tue, 6 Oct 2020 18:12:52 +0800, Tzung-Bi Shih wrote:
> DA7219 uses I2S2 and I2S3 for input and output respectively.  Commit
> 9e30251fb22e ("ASoC: mediatek: mt8183-da7219: support machine driver
> with rt1015") introduces a bug that:
> - If using I2S2 solely, MCLK to DA7219 is 256FS.
> - If using I2S3 solely, MCLK to DA7219 is 128FS.
> - If using I2S3 first and then I2S2, the MCLK changes from 128FS to
>   256FS.  As a result, no sound output to the headset.  Also no sound
>   input from the headset microphone.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: mediatek: mt8183-da7219: fix wrong ops for I2S3
      commit: ebb11d1d9fe2d6b4a47755f7f09b2b631046e308

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 mbox series

Patch

diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
index 4d69ea31bfe4..c2c1eb16fcc0 100644
--- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
+++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
@@ -696,7 +696,7 @@  static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev)
 			if (card == &mt8183_da7219_max98357_card) {
 				dai_link->be_hw_params_fixup =
 					mt8183_i2s_hw_params_fixup;
-				dai_link->ops = &mt8183_mt6358_i2s_ops;
+				dai_link->ops = &mt8183_da7219_i2s_ops;
 				dai_link->cpus = i2s3_max98357a_cpus;
 				dai_link->num_cpus =
 					ARRAY_SIZE(i2s3_max98357a_cpus);