166-asoc-sunxi-fix-distortion-on-16bit-mono.patch 1.7 KB

123456789101112131415161718192021222324252627282930313233
  1. From f8517e7d836269f5fa1e1049394104417d3a7357 Mon Sep 17 00:00:00 2001
  2. From: "B.R. Oake" <broake@openmailbox.org>
  3. Date: Sat, 6 Sep 2014 14:58:50 +0000
  4. Subject: [PATCH] ASoC: sunxi-codec: Fix distortion on 16-bit mono
  5. Patch to remove distortion on 16-bit mono, based on the linux-sunxi-3.4
  6. code.
  7. Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  8. ---
  9. sound/soc/sunxi/sunxi-codec.c | 4 +---
  10. 1 file changed, 1 insertion(+), 3 deletions(-)
  11. --- a/sound/soc/sunxi/sunxi-codec.c
  12. +++ b/sound/soc/sunxi/sunxi-codec.c
  13. @@ -215,9 +215,6 @@ static int sunxi_codec_prepare(struct sn
  14. regmap_update_bits(priv->regmap, SUNXI_DAC_FIFOC, 0x1 << SUNXI_DAC_FIFOC_FIR_VERSION, 0x1 << SUNXI_DAC_FIFOC_FIR_VERSION);
  15. }
  16. - /* set TX FIFO MODE - 0 works for both 16 and 24 bits */
  17. - regmap_update_bits(priv->regmap, SUNXI_DAC_FIFOC, 0x1 << SUNXI_DAC_FIFOC_TX_FIFO_MODE, 0x0 << SUNXI_DAC_FIFOC_TX_FIFO_MODE);
  18. -
  19. /* send last sample when DAC FIFO under run */
  20. regmap_update_bits(priv->regmap, SUNXI_DAC_FIFOC, 0x1 << SUNXI_DAC_FIFOC_SEND_LASAT, 0x0 << SUNXI_DAC_FIFOC_SEND_LASAT);
  21. } else {
  22. @@ -329,6 +326,7 @@ static int sunxi_codec_hw_params(struct
  23. regmap_update_bits(priv->regmap, SUNXI_DAC_FIFOC, 7 << SUNXI_DAC_FIFOC_DAC_FS, hwrate << SUNXI_DAC_FIFOC_DAC_FS);
  24. regmap_update_bits(priv->regmap, SUNXI_DAC_FIFOC, 1 << SUNXI_DAC_FIFOC_MONO_EN, is_mono << SUNXI_DAC_FIFOC_MONO_EN);
  25. regmap_update_bits(priv->regmap, SUNXI_DAC_FIFOC, 1 << SUNXI_DAC_FIFOC_TX_SAMPLE_BITS, is_24bit << SUNXI_DAC_FIFOC_TX_SAMPLE_BITS);
  26. + regmap_update_bits(priv->regmap, SUNXI_DAC_FIFOC, 1 << SUNXI_DAC_FIFOC_TX_FIFO_MODE, !is_24bit << SUNXI_DAC_FIFOC_TX_FIFO_MODE);
  27. if (is_24bit)
  28. priv->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
  29. else