Unverified Commit 07932563 authored by Edward Cragg's avatar Edward Cragg Committed by Mark Brown
Browse files

ASoC: tegra: add a TDM configuration callback 



Add a callback to configure TDM settings for the Tegra30 I2S ASoC 'platform'
driver.

Signed-off-by: default avatarEdward Cragg <edward.cragg@codethink.co.uk>
[ben.dooks@codethink.co.uk: merge fix for power management]
[ben.dooks@codethink.co.uk: add review change for fsync of 1 clock]
Signed-off-by: default avatarBen Dooks <ben.dooks@codethink.co.uk>
Reviewed-by: default avatarJon Hunter <jonathanh@nvidia.com>
Link: https://lore.kernel.org/r/20191018154833.7560-2-ben.dooks@codethink.co.uk


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 16c33235

sound/soc/tegra/tegra30_i2s.c

+29 −0
Original line number Diff line number Diff line
@@ -265,6 +265,34 @@ static int tegra30_i2s_trigger(struct snd_pcm_substream *substream, int cmd, 
	return 0;

}



static int tegra30_i2s_set_tdm(struct snd_soc_dai *dai,

			       unsigned int tx_mask, unsigned int rx_mask,

			       int slots, int slot_width)

{

	struct tegra30_i2s *i2s = snd_soc_dai_get_drvdata(dai);

	unsigned int mask, val;



	dev_dbg(dai->dev, "%s: txmask=0x%08x rxmask=0x%08x slots=%d width=%d\n",

		 __func__, tx_mask, rx_mask, slots, slot_width);



	mask = TEGRA30_I2S_SLOT_CTRL_TOTAL_SLOTS_MASK |

	       TEGRA30_I2S_SLOT_CTRL_RX_SLOT_ENABLES_MASK |

	       TEGRA30_I2S_SLOT_CTRL_TX_SLOT_ENABLES_MASK;



	val = (tx_mask << TEGRA30_I2S_SLOT_CTRL_TX_SLOT_ENABLES_SHIFT) |

	      (rx_mask << TEGRA30_I2S_SLOT_CTRL_RX_SLOT_ENABLES_SHIFT) |

	      ((slots - 1) << TEGRA30_I2S_SLOT_CTRL_TOTAL_SLOTS_SHIFT);



	pm_runtime_get_sync(dai->dev);

	regmap_update_bits(i2s->regmap, TEGRA30_I2S_SLOT_CTRL, mask, val);

	/* set the fsync width to minimum of 1 clock width */

	regmap_update_bits(i2s->regmap, TEGRA30_I2S_CH_CTRL,

			   TEGRA30_I2S_CH_CTRL_FSYNC_WIDTH_MASK, 0x0);

	pm_runtime_put(dai->dev);



	return 0;

}



static int tegra30_i2s_probe(struct snd_soc_dai *dai)

{

	struct tegra30_i2s *i2s = snd_soc_dai_get_drvdata(dai);
@@ -279,6 +307,7 @@ static const struct snd_soc_dai_ops tegra30_i2s_dai_ops = { 
	.set_fmt	= tegra30_i2s_set_fmt,

	.hw_params	= tegra30_i2s_hw_params,

	.trigger	= tegra30_i2s_trigger,

	.set_tdm_slot	= tegra30_i2s_set_tdm,

};



static const struct snd_soc_dai_driver tegra30_i2s_dai_template = {