On Tue, Apr 5, 2022 at 4:00 PM Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> wrote:
> The OSR (OverSampling Rate) setting is set once to the default value
> and never changed throughout the driver. Nevertheless the value is
> read back from the register for further calculations. Just use the
> default value because we know what we have written.
>
> Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
> ---
> sound/soc/fsl/fsl_micfil.c | 10 ++++++----
> sound/soc/fsl/fsl_micfil.h | 1 -
> 2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c
> index fe3e1319b35fd..4b4b7fbbf5c4f 100644
> --- a/sound/soc/fsl/fsl_micfil.c
> +++ b/sound/soc/fsl/fsl_micfil.c
> @@ -29,6 +29,8 @@
> #define FSL_MICFIL_RATES SNDRV_PCM_RATE_8000_48000
> #define FSL_MICFIL_FORMATS (SNDRV_PCM_FMTBIT_S16_LE)
>
> +#define MICFIL_OSR_DEFAULT 16
> +
> struct fsl_micfil {
> struct platform_device *pdev;
> struct regmap *regmap;
> @@ -41,6 +43,7 @@ struct fsl_micfil {
> char name[32];
> int irq[MICFIL_IRQ_LINES];
> int quality; /*QUALITY 2-0 bits */
> + unsigned int osr;
>
unused?
> };
>
> struct fsl_micfil_soc_data {
> @@ -112,11 +115,11 @@ static inline int get_pdm_clk(struct fsl_micfil
> *micfil,
> unsigned int rate)
> {
> u32 ctrl2_reg;
> - int qsel, osr;
> + int qsel;
> int bclk;
> + int osr = MICFIL_OSR_DEFAULT;
>
> regmap_read(micfil->regmap, REG_MICFIL_CTRL2, &ctrl2_reg);
> - osr = 16 - FIELD_GET(MICFIL_CTRL2_CICOSR, ctrl2_reg);
> qsel = FIELD_GET(MICFIL_CTRL2_QSEL, ctrl2_reg);
>
> switch (qsel) {
> @@ -282,7 +285,7 @@ static int fsl_set_clock_params(struct device *dev,
> unsigned int rate)
> /* set CICOSR */
> ret = regmap_update_bits(micfil->regmap, REG_MICFIL_CTRL2,
> MICFIL_CTRL2_CICOSR,
> - FIELD_PREP(MICFIL_CTRL2_CICOSR,
> MICFIL_CTRL2_CICOSR_DEFAULT));
> + FIELD_PREP(MICFIL_CTRL2_CICOSR, 16 -
> MICFIL_OSR_DEFAULT));
> if (ret)
> return ret;
>
> @@ -673,7 +676,6 @@ static int fsl_micfil_probe(struct platform_device
> *pdev)
> micfil->dma_params_rx.addr = res->start + REG_MICFIL_DATACH0;
> micfil->dma_params_rx.maxburst = MICFIL_DMA_MAXBURST_RX;
>
> -
> platform_set_drvdata(pdev, micfil);
>
> pm_runtime_enable(&pdev->dev);
> diff --git a/sound/soc/fsl/fsl_micfil.h b/sound/soc/fsl/fsl_micfil.h
> index 5cecae2519795..08901827047db 100644
> --- a/sound/soc/fsl/fsl_micfil.h
> +++ b/sound/soc/fsl/fsl_micfil.h
> @@ -58,7 +58,6 @@
> #define MICFIL_QSEL_VLOW2_QUALITY 4
>
> #define MICFIL_CTRL2_CICOSR GENMASK(19, 16)
> -#define MICFIL_CTRL2_CICOSR_DEFAULT 0
> #define MICFIL_CTRL2_CLKDIV GENMASK(7, 0)
>
> /* MICFIL Status Register -- REG_MICFIL_STAT 0x08 */
> --
> 2.30.2
>
>
