| Message ID | 20190930165130.10642-6-ben.dooks@codethink.co.uk |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [v3,1/7] ASoC: tegra: add a TDM configuration callback | expand |
On 30/09/2019 17:51, Ben Dooks wrote: > Set the offset to 0 for TDM mode, as per the current setup. Note we also > move the data offset programming to the i2s hw_parameters call as per > the suggestion from Jon Hunter. > > Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> > --- > v2: > - fix the review comments and move the i2s offset setting > --- > sound/soc/tegra/tegra30_i2s.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c > index c573151da341..a03692b0afc3 100644 > --- a/sound/soc/tegra/tegra30_i2s.c > +++ b/sound/soc/tegra/tegra30_i2s.c > @@ -66,7 +66,7 @@ static int tegra30_i2s_set_fmt(struct snd_soc_dai *dai, > unsigned int fmt) > { > struct tegra30_i2s *i2s = snd_soc_dai_get_drvdata(dai); > - unsigned int mask = 0, val = 0; > + unsigned int mask = 0, val = 0, data_offset = 1; > unsigned int ch_mask, ch_val = 0; > > switch (fmt & SND_SOC_DAIFMT_INV_MASK) { > @@ -95,11 +95,13 @@ static int tegra30_i2s_set_fmt(struct snd_soc_dai *dai, > ch_val = TEGRA30_I2S_CH_CTRL_EGDE_CTRL_NEG_EDGE; > val |= TEGRA30_I2S_CTRL_FRAME_FORMAT_FSYNC; > val |= TEGRA30_I2S_CTRL_LRCK_L_LOW; > + data_offset = 0; > break; > case SND_SOC_DAIFMT_DSP_B: > ch_val = TEGRA30_I2S_CH_CTRL_EGDE_CTRL_NEG_EDGE; > val |= TEGRA30_I2S_CTRL_FRAME_FORMAT_FSYNC; > val |= TEGRA30_I2S_CTRL_LRCK_R_LOW; > + data_offset = 0; My understanding is that the difference between dsp-a and dsp-b is that dsp-a has an offset of 1 and dsp-b has an offset of 0. Cheers Jon
On 30/09/2019 21:52, Jon Hunter wrote: > > > On 30/09/2019 17:51, Ben Dooks wrote: >> Set the offset to 0 for TDM mode, as per the current setup. Note we also >> move the data offset programming to the i2s hw_parameters call as per >> the suggestion from Jon Hunter. >> >> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> >> --- >> v2: >> - fix the review comments and move the i2s offset setting >> --- >> sound/soc/tegra/tegra30_i2s.c | 13 +++++++------ >> 1 file changed, 7 insertions(+), 6 deletions(-) >> >> diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c >> index c573151da341..a03692b0afc3 100644 >> --- a/sound/soc/tegra/tegra30_i2s.c >> +++ b/sound/soc/tegra/tegra30_i2s.c >> @@ -66,7 +66,7 @@ static int tegra30_i2s_set_fmt(struct snd_soc_dai *dai, >> unsigned int fmt) >> { >> struct tegra30_i2s *i2s = snd_soc_dai_get_drvdata(dai); >> - unsigned int mask = 0, val = 0; >> + unsigned int mask = 0, val = 0, data_offset = 1; >> unsigned int ch_mask, ch_val = 0; >> >> switch (fmt & SND_SOC_DAIFMT_INV_MASK) { >> @@ -95,11 +95,13 @@ static int tegra30_i2s_set_fmt(struct snd_soc_dai *dai, >> ch_val = TEGRA30_I2S_CH_CTRL_EGDE_CTRL_NEG_EDGE; >> val |= TEGRA30_I2S_CTRL_FRAME_FORMAT_FSYNC; >> val |= TEGRA30_I2S_CTRL_LRCK_L_LOW; >> + data_offset = 0; >> break; >> case SND_SOC_DAIFMT_DSP_B: >> ch_val = TEGRA30_I2S_CH_CTRL_EGDE_CTRL_NEG_EDGE; >> val |= TEGRA30_I2S_CTRL_FRAME_FORMAT_FSYNC; >> val |= TEGRA30_I2S_CTRL_LRCK_R_LOW; >> + data_offset = 0; > > My understanding is that the difference between dsp-a and dsp-b is that > dsp-a has an offset of 1 and dsp-b has an offset of 0. Ok, can anyone else check this before I make the change for DSP_B ?
On Mon, Sep 30, 2019 at 09:52:15PM +0100, Jon Hunter wrote: > My understanding is that the difference between dsp-a and dsp-b is that > dsp-a has an offset of 1 and dsp-b has an offset of 0. Yes.
diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c index c573151da341..a03692b0afc3 100644 --- a/sound/soc/tegra/tegra30_i2s.c +++ b/sound/soc/tegra/tegra30_i2s.c @@ -66,7 +66,7 @@ static int tegra30_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) { struct tegra30_i2s *i2s = snd_soc_dai_get_drvdata(dai); - unsigned int mask = 0, val = 0; + unsigned int mask = 0, val = 0, data_offset = 1; unsigned int ch_mask, ch_val = 0; switch (fmt & SND_SOC_DAIFMT_INV_MASK) { @@ -95,11 +95,13 @@ static int tegra30_i2s_set_fmt(struct snd_soc_dai *dai, ch_val = TEGRA30_I2S_CH_CTRL_EGDE_CTRL_NEG_EDGE; val |= TEGRA30_I2S_CTRL_FRAME_FORMAT_FSYNC; val |= TEGRA30_I2S_CTRL_LRCK_L_LOW; + data_offset = 0; break; case SND_SOC_DAIFMT_DSP_B: ch_val = TEGRA30_I2S_CH_CTRL_EGDE_CTRL_NEG_EDGE; val |= TEGRA30_I2S_CTRL_FRAME_FORMAT_FSYNC; val |= TEGRA30_I2S_CTRL_LRCK_R_LOW; + data_offset = 0; break; case SND_SOC_DAIFMT_I2S: val |= TEGRA30_I2S_CTRL_FRAME_FORMAT_LRCK; @@ -120,6 +122,10 @@ static int tegra30_i2s_set_fmt(struct snd_soc_dai *dai, pm_runtime_get_sync(dai->dev); regmap_update_bits(i2s->regmap, TEGRA30_I2S_CTRL, mask, val); regmap_update_bits(i2s->regmap, TEGRA30_I2S_CH_CTRL, ch_mask, ch_val); + val = (data_offset << TEGRA30_I2S_OFFSET_RX_DATA_OFFSET_SHIFT) | + (data_offset << TEGRA30_I2S_OFFSET_TX_DATA_OFFSET_SHIFT); + regmap_write(i2s->regmap, TEGRA30_I2S_OFFSET, val); + pm_runtime_put(dai->dev); return 0; @@ -203,11 +209,6 @@ static int tegra30_i2s_hw_params(struct snd_pcm_substream *substream, } i2s->soc_data->set_audio_cif(i2s->regmap, reg, &cif_conf); - - val = (1 << TEGRA30_I2S_OFFSET_RX_DATA_OFFSET_SHIFT) | - (1 << TEGRA30_I2S_OFFSET_TX_DATA_OFFSET_SHIFT); - regmap_write(i2s->regmap, TEGRA30_I2S_OFFSET, val); - return 0; }
Set the offset to 0 for TDM mode, as per the current setup. Note we also move the data offset programming to the i2s hw_parameters call as per the suggestion from Jon Hunter. Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> --- v2: - fix the review comments and move the i2s offset setting --- sound/soc/tegra/tegra30_i2s.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)