From f3d96d45f682e3f760594c68afee855aebeb3572 Mon Sep 17 00:00:00 2001 From: Viorel Suman Date: Mon, 27 Aug 2018 13:50:17 +0300 Subject: MLK-18898-1: ASoC: fsl_sai: select pinctrl state as function of bitclock rate Similar to DSD512 case we need a PCM pinctrl state option to map SAI BCLK to codec MCLK pin. Given that bitclock rate is function of slots number and slot width - pass bclk rate as parameter value from SAI driver. Signed-off-by: Viorel Suman (cherry picked from commit 826caeae32713cff7ad50de8ebc9915de975edd9) --- sound/soc/fsl/fsl_dsd.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'sound/soc/fsl/fsl_dsd.h') diff --git a/sound/soc/fsl/fsl_dsd.h b/sound/soc/fsl/fsl_dsd.h index 814e78f406b8..bc149631a2af 100644 --- a/sound/soc/fsl/fsl_dsd.h +++ b/sound/soc/fsl/fsl_dsd.h @@ -30,23 +30,22 @@ static bool fsl_is_dsd(struct snd_pcm_hw_params *params) } static struct pinctrl_state *fsl_get_pins_state(struct pinctrl *pinctrl, - struct snd_pcm_hw_params *params) + struct snd_pcm_hw_params *params, u32 bclk) { - int dsd_bclk; struct pinctrl_state *state = 0; if (fsl_is_dsd(params)) { - dsd_bclk = params_rate(params) * params_physical_width(params); - - switch (dsd_bclk) { - case 22579200: /* DSD512 */ + /* DSD512@44.1kHz, DSD512@48kHz */ + if (bclk >= 22579200) state = pinctrl_lookup_state(pinctrl, "dsd512"); - break; - } /* Get default DSD state */ if (IS_ERR_OR_NULL(state)) state = pinctrl_lookup_state(pinctrl, "dsd"); + } else { + /* 706k32b2c, 768k32b2c, etc */ + if (bclk >= 45158400) + state = pinctrl_lookup_state(pinctrl, "pcm_b2m"); } /* Get default state */ -- cgit v1.2.3