* [PATCH 2/2] ASoC: fsl: using params_width function to simplify code
2015-11-24 7:31 [PATCH 1/2] ASoC: fsl_sai: add tdm slots operation support Zidan Wang
@ 2015-11-24 7:32 ` Zidan Wang
2015-11-24 8:52 ` Nicolin Chen
` (2 more replies)
2015-11-24 8:50 ` [PATCH 1/2] ASoC: fsl_sai: add tdm slots operation support Nicolin Chen
2015-11-25 12:11 ` Applied "ASoC: fsl_sai: add tdm slots operation support" to the asoc tree Mark Brown
2 siblings, 3 replies; 7+ messages in thread
From: Zidan Wang @ 2015-11-24 7:32 UTC (permalink / raw)
To: nicoleotsuka; +Cc: alsa-devel, broonie, timur, Zidan Wang, Xiubo.Lee
using params_width function to simplify code.
Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
---
sound/soc/fsl/fsl_asrc.c | 2 +-
sound/soc/fsl/fsl_esai.c | 2 +-
sound/soc/fsl/fsl_sai.c | 2 +-
sound/soc/fsl/fsl_ssi.c | 3 +--
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c
index 9f087d4..6d06366 100644
--- a/sound/soc/fsl/fsl_asrc.c
+++ b/sound/soc/fsl/fsl_asrc.c
@@ -447,7 +447,7 @@ static int fsl_asrc_dai_hw_params(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
struct fsl_asrc *asrc_priv = snd_soc_dai_get_drvdata(dai);
- int width = snd_pcm_format_width(params_format(params));
+ int width = params_width(params);
struct snd_pcm_runtime *runtime = substream->runtime;
struct fsl_asrc_pair *pair = runtime->private_data;
unsigned int channels = params_channels(params);
diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
index 504e731..45d4319 100644
--- a/sound/soc/fsl/fsl_esai.c
+++ b/sound/soc/fsl/fsl_esai.c
@@ -510,7 +510,7 @@ static int fsl_esai_hw_params(struct snd_pcm_substream *substream,
{
struct fsl_esai *esai_priv = snd_soc_dai_get_drvdata(dai);
bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
- u32 width = snd_pcm_format_width(params_format(params));
+ u32 width = params_width(params);
u32 channels = params_channels(params);
u32 pins = DIV_ROUND_UP(channels, esai_priv->slots);
u32 slot_width = width;
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index c01322c..8832901 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -404,7 +404,7 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream,
struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai);
bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
unsigned int channels = params_channels(params);
- u32 word_width = snd_pcm_format_width(params_format(params));
+ u32 word_width = params_width(params);
u32 val_cr4 = 0, val_cr5 = 0;
u32 slots = (channels == 1) ? 2 : channels;
u32 slot_width = word_width;
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 674abf7..e3abad5 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -767,8 +767,7 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream,
struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(cpu_dai);
struct regmap *regs = ssi_private->regs;
unsigned int channels = params_channels(hw_params);
- unsigned int sample_size =
- snd_pcm_format_width(params_format(hw_params));
+ unsigned int sample_size = params_width(hw_params);
u32 wl = CCSR_SSI_SxCCR_WL(sample_size);
int ret;
u32 scr_val;
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 2/2] ASoC: fsl: using params_width function to simplify code
2015-11-24 7:32 ` [PATCH 2/2] ASoC: fsl: using params_width function to simplify code Zidan Wang
@ 2015-11-24 8:52 ` Nicolin Chen
2015-11-25 13:00 ` Applied "ASoC: fsl: using params_width function to simplify code" to the asoc tree Mark Brown
2015-11-29 14:35 ` [PATCH 2/2] ASoC: fsl: using params_width function to simplify code Timur Tabi
2 siblings, 0 replies; 7+ messages in thread
From: Nicolin Chen @ 2015-11-24 8:52 UTC (permalink / raw)
To: Zidan Wang; +Cc: alsa-devel, broonie, timur, Xiubo.Lee
On Tue, Nov 24, 2015 at 03:32:09PM +0800, Zidan Wang wrote:
> using params_width function to simplify code.
>
> Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
> ---
> sound/soc/fsl/fsl_asrc.c | 2 +-
> sound/soc/fsl/fsl_esai.c | 2 +-
> sound/soc/fsl/fsl_sai.c | 2 +-
> sound/soc/fsl/fsl_ssi.c | 3 +--
> 4 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c
> index 9f087d4..6d06366 100644
> --- a/sound/soc/fsl/fsl_asrc.c
> +++ b/sound/soc/fsl/fsl_asrc.c
> @@ -447,7 +447,7 @@ static int fsl_asrc_dai_hw_params(struct snd_pcm_substream *substream,
> struct snd_soc_dai *dai)
> {
> struct fsl_asrc *asrc_priv = snd_soc_dai_get_drvdata(dai);
> - int width = snd_pcm_format_width(params_format(params));
> + int width = params_width(params);
> struct snd_pcm_runtime *runtime = substream->runtime;
> struct fsl_asrc_pair *pair = runtime->private_data;
> unsigned int channels = params_channels(params);
> diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
> index 504e731..45d4319 100644
> --- a/sound/soc/fsl/fsl_esai.c
> +++ b/sound/soc/fsl/fsl_esai.c
> @@ -510,7 +510,7 @@ static int fsl_esai_hw_params(struct snd_pcm_substream *substream,
> {
> struct fsl_esai *esai_priv = snd_soc_dai_get_drvdata(dai);
> bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
> - u32 width = snd_pcm_format_width(params_format(params));
> + u32 width = params_width(params);
> u32 channels = params_channels(params);
> u32 pins = DIV_ROUND_UP(channels, esai_priv->slots);
> u32 slot_width = width;
> diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
> index c01322c..8832901 100644
> --- a/sound/soc/fsl/fsl_sai.c
> +++ b/sound/soc/fsl/fsl_sai.c
> @@ -404,7 +404,7 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream,
> struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai);
> bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
> unsigned int channels = params_channels(params);
> - u32 word_width = snd_pcm_format_width(params_format(params));
> + u32 word_width = params_width(params);
> u32 val_cr4 = 0, val_cr5 = 0;
> u32 slots = (channels == 1) ? 2 : channels;
> u32 slot_width = word_width;
> diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
> index 674abf7..e3abad5 100644
> --- a/sound/soc/fsl/fsl_ssi.c
> +++ b/sound/soc/fsl/fsl_ssi.c
> @@ -767,8 +767,7 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream,
> struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(cpu_dai);
> struct regmap *regs = ssi_private->regs;
> unsigned int channels = params_channels(hw_params);
> - unsigned int sample_size =
> - snd_pcm_format_width(params_format(hw_params));
> + unsigned int sample_size = params_width(hw_params);
> u32 wl = CCSR_SSI_SxCCR_WL(sample_size);
> int ret;
> u32 scr_val;
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Applied "ASoC: fsl: using params_width function to simplify code" to the asoc tree
2015-11-24 7:32 ` [PATCH 2/2] ASoC: fsl: using params_width function to simplify code Zidan Wang
2015-11-24 8:52 ` Nicolin Chen
@ 2015-11-25 13:00 ` Mark Brown
2015-11-29 14:35 ` [PATCH 2/2] ASoC: fsl: using params_width function to simplify code Timur Tabi
2 siblings, 0 replies; 7+ messages in thread
From: Mark Brown @ 2015-11-25 13:00 UTC (permalink / raw)
To: Zidan Wang, Nicolin Chen, Mark Brown; +Cc: alsa-devel
The patch
ASoC: fsl: using params_width function to simplify code
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 4ca730436a676afebbe6b77d65b5b4c4d7d38b9c Mon Sep 17 00:00:00 2001
From: Zidan Wang <zidan.wang@freescale.com>
Date: Tue, 24 Nov 2015 15:32:09 +0800
Subject: [PATCH] ASoC: fsl: using params_width function to simplify code
using params_width function to simplify code.
Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/fsl_asrc.c | 2 +-
sound/soc/fsl/fsl_esai.c | 2 +-
sound/soc/fsl/fsl_sai.c | 2 +-
sound/soc/fsl/fsl_ssi.c | 3 +--
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c
index 9f087d4f73ed..6d0636605ed2 100644
--- a/sound/soc/fsl/fsl_asrc.c
+++ b/sound/soc/fsl/fsl_asrc.c
@@ -447,7 +447,7 @@ static int fsl_asrc_dai_hw_params(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
struct fsl_asrc *asrc_priv = snd_soc_dai_get_drvdata(dai);
- int width = snd_pcm_format_width(params_format(params));
+ int width = params_width(params);
struct snd_pcm_runtime *runtime = substream->runtime;
struct fsl_asrc_pair *pair = runtime->private_data;
unsigned int channels = params_channels(params);
diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
index 504e7318f225..45d4319b2079 100644
--- a/sound/soc/fsl/fsl_esai.c
+++ b/sound/soc/fsl/fsl_esai.c
@@ -510,7 +510,7 @@ static int fsl_esai_hw_params(struct snd_pcm_substream *substream,
{
struct fsl_esai *esai_priv = snd_soc_dai_get_drvdata(dai);
bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
- u32 width = snd_pcm_format_width(params_format(params));
+ u32 width = params_width(params);
u32 channels = params_channels(params);
u32 pins = DIV_ROUND_UP(channels, esai_priv->slots);
u32 slot_width = width;
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index dc0cc65406f5..3da278313591 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -404,7 +404,7 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream,
struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai);
bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
unsigned int channels = params_channels(params);
- u32 word_width = snd_pcm_format_width(params_format(params));
+ u32 word_width = params_width(params);
u32 val_cr4 = 0, val_cr5 = 0;
u32 slots = (channels == 1) ? 2 : channels;
u32 slot_width = word_width;
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 674abf778715..e3abad5f980a 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -767,8 +767,7 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream,
struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(cpu_dai);
struct regmap *regs = ssi_private->regs;
unsigned int channels = params_channels(hw_params);
- unsigned int sample_size =
- snd_pcm_format_width(params_format(hw_params));
+ unsigned int sample_size = params_width(hw_params);
u32 wl = CCSR_SSI_SxCCR_WL(sample_size);
int ret;
u32 scr_val;
--
2.6.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 2/2] ASoC: fsl: using params_width function to simplify code
2015-11-24 7:32 ` [PATCH 2/2] ASoC: fsl: using params_width function to simplify code Zidan Wang
2015-11-24 8:52 ` Nicolin Chen
2015-11-25 13:00 ` Applied "ASoC: fsl: using params_width function to simplify code" to the asoc tree Mark Brown
@ 2015-11-29 14:35 ` Timur Tabi
2 siblings, 0 replies; 7+ messages in thread
From: Timur Tabi @ 2015-11-29 14:35 UTC (permalink / raw)
To: Zidan Wang
Cc: nicoleotsuka, alsa-devel mailing list, Mark Brown, Timur Tabi,
Xiubo.Lee
On Tue, Nov 24, 2015 at 2:32 AM, Zidan Wang <zidan.wang@freescale.com> wrote:
> using params_width function to simplify code.
>
> Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
> ---
> sound/soc/fsl/fsl_asrc.c | 2 +-
> sound/soc/fsl/fsl_esai.c | 2 +-
> sound/soc/fsl/fsl_sai.c | 2 +-
> sound/soc/fsl/fsl_ssi.c | 3 +--
Acked-by: Timur Tabi <timur@tabi.org>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] ASoC: fsl_sai: add tdm slots operation support
2015-11-24 7:31 [PATCH 1/2] ASoC: fsl_sai: add tdm slots operation support Zidan Wang
2015-11-24 7:32 ` [PATCH 2/2] ASoC: fsl: using params_width function to simplify code Zidan Wang
@ 2015-11-24 8:50 ` Nicolin Chen
2015-11-25 12:11 ` Applied "ASoC: fsl_sai: add tdm slots operation support" to the asoc tree Mark Brown
2 siblings, 0 replies; 7+ messages in thread
From: Nicolin Chen @ 2015-11-24 8:50 UTC (permalink / raw)
To: Zidan Wang; +Cc: alsa-devel, broonie, timur, Xiubo.Lee
On Tue, Nov 24, 2015 at 03:31:54PM +0800, Zidan Wang wrote:
> Add tdm slots operation support. If tdm slots and slot width have
> been configured in machine driver, we should use these values.
> Otherwise, using relevant channels and word length to set slots
> and slot width.
>
> SAI will generate BCLK depends on sample rate, slots and slot width.
> And there may be unused BCLK cycles before each LRCLK transition.
>
> Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
> ---
> sound/soc/fsl/fsl_sai.c | 31 +++++++++++++++++++++++++------
> sound/soc/fsl/fsl_sai.h | 3 +++
> 2 files changed, 28 insertions(+), 6 deletions(-)
>
> diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
> index 4b042fd..c01322c 100644
> --- a/sound/soc/fsl/fsl_sai.c
> +++ b/sound/soc/fsl/fsl_sai.c
> @@ -126,6 +126,17 @@ out:
> return IRQ_HANDLED;
> }
>
> +static int fsl_sai_set_dai_tdm_slot(struct snd_soc_dai *cpu_dai, u32 tx_mask,
> + u32 rx_mask, int slots, int slot_width)
> +{
> + struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai);
> +
> + sai->slots = slots;
> + sai->slot_width = slot_width;
> +
> + 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)
> {
> @@ -395,11 +406,19 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream,
> unsigned int channels = params_channels(params);
> u32 word_width = snd_pcm_format_width(params_format(params));
> u32 val_cr4 = 0, val_cr5 = 0;
> + u32 slots = (channels == 1) ? 2 : channels;
> + u32 slot_width = word_width;
> int ret;
>
> + if (sai->slots)
> + slots = sai->slots;
> +
> + if (sai->slot_width)
> + slot_width = sai->slot_width;
> +
> if (!sai->is_slave_mode) {
> ret = fsl_sai_set_bclk(cpu_dai, tx,
> - 2 * word_width * params_rate(params));
> + slots * slot_width * params_rate(params));
> if (ret)
> return ret;
>
> @@ -411,21 +430,20 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream,
>
> sai->mclk_streams |= BIT(substream->stream);
> }
> -
> }
>
> if (!sai->is_dsp_mode)
> - val_cr4 |= FSL_SAI_CR4_SYWD(word_width);
> + val_cr4 |= FSL_SAI_CR4_SYWD(slot_width);
>
> - val_cr5 |= FSL_SAI_CR5_WNW(word_width);
> - val_cr5 |= FSL_SAI_CR5_W0W(word_width);
> + val_cr5 |= FSL_SAI_CR5_WNW(slot_width);
> + val_cr5 |= FSL_SAI_CR5_W0W(slot_width);
>
> if (sai->is_lsb_first)
> val_cr5 |= FSL_SAI_CR5_FBT(0);
> else
> val_cr5 |= FSL_SAI_CR5_FBT(word_width - 1);
>
> - val_cr4 |= FSL_SAI_CR4_FRSZ(channels);
> + val_cr4 |= FSL_SAI_CR4_FRSZ(slots);
>
> /*
> * For SAI master mode, when Tx(Rx) sync with Rx(Tx) clock, Rx(Tx) will
> @@ -592,6 +610,7 @@ static void fsl_sai_shutdown(struct snd_pcm_substream *substream,
> static const struct snd_soc_dai_ops fsl_sai_pcm_dai_ops = {
> .set_sysclk = fsl_sai_set_dai_sysclk,
> .set_fmt = fsl_sai_set_dai_fmt,
> + .set_tdm_slot = fsl_sai_set_dai_tdm_slot,
> .hw_params = fsl_sai_hw_params,
> .hw_free = fsl_sai_hw_free,
> .trigger = fsl_sai_trigger,
> diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h
> index b95fbc3..d9ed7be 100644
> --- a/sound/soc/fsl/fsl_sai.h
> +++ b/sound/soc/fsl/fsl_sai.h
> @@ -143,6 +143,9 @@ struct fsl_sai {
>
> unsigned int mclk_id[2];
> unsigned int mclk_streams;
> + unsigned int slots;
> + unsigned int slot_width;
> +
> struct snd_dmaengine_dai_dma_data dma_params_rx;
> struct snd_dmaengine_dai_dma_data dma_params_tx;
> };
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Applied "ASoC: fsl_sai: add tdm slots operation support" to the asoc tree
2015-11-24 7:31 [PATCH 1/2] ASoC: fsl_sai: add tdm slots operation support Zidan Wang
2015-11-24 7:32 ` [PATCH 2/2] ASoC: fsl: using params_width function to simplify code Zidan Wang
2015-11-24 8:50 ` [PATCH 1/2] ASoC: fsl_sai: add tdm slots operation support Nicolin Chen
@ 2015-11-25 12:11 ` Mark Brown
2 siblings, 0 replies; 7+ messages in thread
From: Mark Brown @ 2015-11-25 12:11 UTC (permalink / raw)
To: Zidan Wang, Nicolin Chen, Mark Brown; +Cc: alsa-devel
The patch
ASoC: fsl_sai: add tdm slots operation support
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From c1df29648f1e3ffb8bac38e27a22b50f5c019adf Mon Sep 17 00:00:00 2001
From: Zidan Wang <zidan.wang@freescale.com>
Date: Tue, 24 Nov 2015 15:31:54 +0800
Subject: [PATCH] ASoC: fsl_sai: add tdm slots operation support
Add tdm slots operation support. If tdm slots and slot width have
been configured in machine driver, we should use these values.
Otherwise, using relevant channels and word length to set slots
and slot width.
SAI will generate BCLK depends on sample rate, slots and slot width.
And there may be unused BCLK cycles before each LRCLK transition.
Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/fsl_sai.c | 31 +++++++++++++++++++++++++------
sound/soc/fsl/fsl_sai.h | 3 +++
2 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index 520dbadaa8b1..43ba5dc26775 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -126,6 +126,17 @@ out:
return IRQ_HANDLED;
}
+static int fsl_sai_set_dai_tdm_slot(struct snd_soc_dai *cpu_dai, u32 tx_mask,
+ u32 rx_mask, int slots, int slot_width)
+{
+ struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai);
+
+ sai->slots = slots;
+ sai->slot_width = slot_width;
+
+ 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)
{
@@ -395,11 +406,19 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream,
unsigned int channels = params_channels(params);
u32 word_width = snd_pcm_format_width(params_format(params));
u32 val_cr4 = 0, val_cr5 = 0;
+ u32 slots = (channels == 1) ? 2 : channels;
+ u32 slot_width = word_width;
int ret;
+ if (sai->slots)
+ slots = sai->slots;
+
+ if (sai->slot_width)
+ slot_width = sai->slot_width;
+
if (!sai->is_slave_mode) {
ret = fsl_sai_set_bclk(cpu_dai, tx,
- 2 * word_width * params_rate(params));
+ slots * slot_width * params_rate(params));
if (ret)
return ret;
@@ -411,21 +430,20 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream,
sai->mclk_streams |= BIT(substream->stream);
}
-
}
if (!sai->is_dsp_mode)
- val_cr4 |= FSL_SAI_CR4_SYWD(word_width);
+ val_cr4 |= FSL_SAI_CR4_SYWD(slot_width);
- val_cr5 |= FSL_SAI_CR5_WNW(word_width);
- val_cr5 |= FSL_SAI_CR5_W0W(word_width);
+ val_cr5 |= FSL_SAI_CR5_WNW(slot_width);
+ val_cr5 |= FSL_SAI_CR5_W0W(slot_width);
if (sai->is_lsb_first)
val_cr5 |= FSL_SAI_CR5_FBT(0);
else
val_cr5 |= FSL_SAI_CR5_FBT(word_width - 1);
- val_cr4 |= FSL_SAI_CR4_FRSZ(channels);
+ val_cr4 |= FSL_SAI_CR4_FRSZ(slots);
/*
* For SAI master mode, when Tx(Rx) sync with Rx(Tx) clock, Rx(Tx) will
@@ -591,6 +609,7 @@ static void fsl_sai_shutdown(struct snd_pcm_substream *substream,
static const struct snd_soc_dai_ops fsl_sai_pcm_dai_ops = {
.set_sysclk = fsl_sai_set_dai_sysclk,
.set_fmt = fsl_sai_set_dai_fmt,
+ .set_tdm_slot = fsl_sai_set_dai_tdm_slot,
.hw_params = fsl_sai_hw_params,
.hw_free = fsl_sai_hw_free,
.trigger = fsl_sai_trigger,
diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h
index b95fbc3f68eb..d9ed7be8cb34 100644
--- a/sound/soc/fsl/fsl_sai.h
+++ b/sound/soc/fsl/fsl_sai.h
@@ -143,6 +143,9 @@ struct fsl_sai {
unsigned int mclk_id[2];
unsigned int mclk_streams;
+ unsigned int slots;
+ unsigned int slot_width;
+
struct snd_dmaengine_dai_dma_data dma_params_rx;
struct snd_dmaengine_dai_dma_data dma_params_tx;
};
--
2.6.2
^ permalink raw reply related [flat|nested] 7+ messages in thread