ASoC: sun4i-codec: fixed 32bit audio capture support for H3/H2+

32bit and 24bit audio capture formats for H3/H2+ are broken because the
RX_SAMPLE_BITS and the RX_FIFO_MODE bits of AC_ADC_FIFOC register of the audio
codec are not set to operate in 24bit mode but in 16bit mode only.
The following patch sets the H3 audio codec registers and the DMA bus width
properly when a 24/32bit capture is requested.

Signed-off-by: Andrea Bondavalli <andrea.bondavalli74@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index baa9007464ed7458d3c2ba4a777e6f83903989cf..5da4efe7a5505bb90fef17f13e7b73c1529cd7b5 100644 (file)
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -346,11 +346,6 @@ static int sun4i_codec_prepare_capture(struct snd_pcm_substream *substream,
                                   0x3 << 8,
                                   0x1 << 8);
 
-       /* Fill most significant bits with valid data MSB */
-       regmap_field_update_bits(scodec->reg_adc_fifoc,
-                                BIT(SUN4I_CODEC_ADC_FIFOC_RX_FIFO_MODE),
-                                BIT(SUN4I_CODEC_ADC_FIFOC_RX_FIFO_MODE));
-
        return 0;
 }
 
@@ -490,6 +485,30 @@ static int sun4i_codec_hw_params_capture(struct sun4i_codec *scodec,
                                         BIT(SUN4I_CODEC_ADC_FIFOC_MONO_EN),
                                         0);
 
+       /* Set the number of sample bits to either 16 or 24 bits */
+       if (hw_param_interval(params, SNDRV_PCM_HW_PARAM_SAMPLE_BITS)->min == 32) {
+               regmap_field_update_bits(scodec->reg_adc_fifoc,
+                                  BIT(SUN4I_CODEC_ADC_FIFOC_RX_SAMPLE_BITS),
+                                  BIT(SUN4I_CODEC_ADC_FIFOC_RX_SAMPLE_BITS));
+
+               regmap_field_update_bits(scodec->reg_adc_fifoc,
+                                  BIT(SUN4I_CODEC_ADC_FIFOC_RX_FIFO_MODE),
+                                  0);
+
+               scodec->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+       } else {
+               regmap_field_update_bits(scodec->reg_adc_fifoc,
+                                  BIT(SUN4I_CODEC_ADC_FIFOC_RX_SAMPLE_BITS),
+                                  0);
+
+               /* Fill most significant bits with valid data MSB */
+               regmap_field_update_bits(scodec->reg_adc_fifoc,
+                                  BIT(SUN4I_CODEC_ADC_FIFOC_RX_FIFO_MODE),
+                                  BIT(SUN4I_CODEC_ADC_FIFOC_RX_FIFO_MODE));
+
+               scodec->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
+       }
+
        return 0;
 }