From aff2edb9c66a1188ed6554643e3cf76595c56846 Mon Sep 17 00:00:00 2001 From: Leonard Crestez Date: Thu, 3 Oct 2019 20:44:59 +0300 Subject: [PATCH] Revert "ASoC: fsl_sai: Implement set_bclk_ratio" This reverts commit 63d1a3488ff58e094a7f517cf93c0250f0a3f6be. --- sound/soc/fsl/fsl_sai.c | 21 ++------------------- sound/soc/fsl/fsl_sai.h | 1 - 2 files changed, 2 insertions(+), 20 deletions(-) --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -137,16 +137,6 @@ static int fsl_sai_set_dai_tdm_slot(stru return 0; } -static int fsl_sai_set_dai_bclk_ratio(struct snd_soc_dai *dai, - unsigned int ratio) -{ - struct fsl_sai *sai = snd_soc_dai_get_drvdata(dai); - - sai->bclk_ratio = ratio; - - return 0; -} - static int fsl_sai_set_dai_sysclk_tr(struct snd_soc_dai *cpu_dai, int clk_id, unsigned int freq, int fsl_dir) { @@ -434,14 +424,8 @@ static int fsl_sai_hw_params(struct snd_ slot_width = sai->slot_width; if (!sai->is_slave_mode) { - if (sai->bclk_ratio) - ret = fsl_sai_set_bclk(cpu_dai, tx, - sai->bclk_ratio * - params_rate(params)); - else - ret = fsl_sai_set_bclk(cpu_dai, tx, - slots * slot_width * - params_rate(params)); + ret = fsl_sai_set_bclk(cpu_dai, tx, + slots * slot_width * params_rate(params)); if (ret) return ret; @@ -647,7 +631,6 @@ static void fsl_sai_shutdown(struct snd_ } static const struct snd_soc_dai_ops fsl_sai_pcm_dai_ops = { - .set_bclk_ratio = fsl_sai_set_dai_bclk_ratio, .set_sysclk = fsl_sai_set_dai_sysclk, .set_fmt = fsl_sai_set_dai_fmt, .set_tdm_slot = fsl_sai_set_dai_tdm_slot, --- a/sound/soc/fsl/fsl_sai.h +++ b/sound/soc/fsl/fsl_sai.h @@ -176,7 +176,6 @@ struct fsl_sai { unsigned int mclk_streams; unsigned int slots; unsigned int slot_width; - unsigned int bclk_ratio; const struct fsl_sai_soc_data *soc_data; struct snd_soc_dai_driver cpu_dai_drv;