[alsa-devel] [PATCH v4 2/9] ASoC: sun8i-codec: Don't hardcode BCLK / LRCK ratio

[Vasily Khoruzhick]

On Wednesday, October 17, 2018 12:12:48 AM PDT Maxime Ripard wrote:
> Hi!
> 
> On Mon, Oct 15, 2018 at 08:02:32PM -0700, Vasily Khoruzhick wrote:
> > BCLK / LRCK ratio should be sample size * channels, but it was
> > hardcoded to 32 (0x1 is 32 as per A33 and A64 datasheets).
> > 
> > Calculate it basing on sample size and number of channels.
> > 
> > Signed-off-by: Vasily Khoruzhick <anarsoul at gmail.com>
> > ---
> > 
> >  sound/soc/sunxi/sun8i-codec.c | 26 +++++++++++++++++++++-----
> >  1 file changed, 21 insertions(+), 5 deletions(-)
> > 
> > diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c
> > index fb37dd927e33..2467fab94a19 100644
> > --- a/sound/soc/sunxi/sun8i-codec.c
> > +++ b/sound/soc/sunxi/sun8i-codec.c
> > @@ -24,6 +24,7 @@
> > 
> >  #include <linux/io.h>
> >  #include <linux/pm_runtime.h>
> >  #include <linux/regmap.h>
> > 
> > +#include <linux/log2.h>
> > 
> >  #include <sound/pcm_params.h>
> >  #include <sound/soc.h>
> > 
> > @@ -52,7 +53,6 @@
> > 
> >  #define SUN8I_AIF1CLK_CTRL_AIF1_LRCK_INV		13
> >  #define SUN8I_AIF1CLK_CTRL_AIF1_BCLK_DIV		9
> >  #define SUN8I_AIF1CLK_CTRL_AIF1_LRCK_DIV		6
> > 
> > -#define SUN8I_AIF1CLK_CTRL_AIF1_LRCK_DIV_16		(1 << 6)
> > 
> >  #define SUN8I_AIF1CLK_CTRL_AIF1_WORD_SIZ		4
> >  #define SUN8I_AIF1CLK_CTRL_AIF1_WORD_SIZ_16		(1 << 4)
> >  #define SUN8I_AIF1CLK_CTRL_AIF1_DATA_FMT		2
> > 
> > @@ -257,8 +257,8 @@ static int sun8i_set_fmt(struct snd_soc_dai *dai,
> > unsigned int fmt)> 
> >  }
> >  
> >  struct sun8i_codec_clk_div {
> > 
> > -	u8	div;
> > -	u8	val;
> > +	unsigned int	div;
> > +	u8		val;
> > 
> >  };
> 
> Do we still need that type change? It looks like you're not using it
> anywhere in that patch.

We don't need it, I'll drop it for v5.

> 
> Thanks!
> Maxime