Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9515c101 authored Jun 06, 2012 by Stephen Warren Committed by Mark Brown Jun 08, 2012

ASoC: tegra: add .stream_name to CPU DAIs



This is certainly required if the I2S and SPDIF controllers are converted
to be CODECs, and is probably good practice irrespective.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

parent d392dead

sound/soc/tegra/tegra20_i2s.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -261,12 +261,14 @@ static const struct snd_soc_dai_ops tegra20_i2s_dai_ops = {
	static const struct snd_soc_dai_driver tegra20_i2s_dai_template = {		static const struct snd_soc_dai_driver tegra20_i2s_dai_template = {
	.probe = tegra20_i2s_probe,		.probe = tegra20_i2s_probe,
	.playback = {		.playback = {
			.stream_name = "Playback",
	.channels_min = 2,		.channels_min = 2,
	.channels_max = 2,		.channels_max = 2,
	.rates = SNDRV_PCM_RATE_8000_96000,		.rates = SNDRV_PCM_RATE_8000_96000,
	.formats = SNDRV_PCM_FMTBIT_S16_LE,		.formats = SNDRV_PCM_FMTBIT_S16_LE,
	},		},
	.capture = {		.capture = {
			.stream_name = "Capture",
	.channels_min = 2,		.channels_min = 2,
	.channels_max = 2,		.channels_max = 2,
	.rates = SNDRV_PCM_RATE_8000_96000,		.rates = SNDRV_PCM_RATE_8000_96000,

sound/soc/tegra/tegra20_spdif.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -181,6 +181,7 @@ static struct snd_soc_dai_driver tegra20_spdif_dai = {
	.name = DRV_NAME,		.name = DRV_NAME,
	.probe = tegra20_spdif_probe,		.probe = tegra20_spdif_probe,
	.playback = {		.playback = {
			.stream_name = "Playback",
	.channels_min = 2,		.channels_min = 2,
	.channels_max = 2,		.channels_max = 2,
	.rates = SNDRV_PCM_RATE_32000 \| SNDRV_PCM_RATE_44100 \|		.rates = SNDRV_PCM_RATE_32000 \| SNDRV_PCM_RATE_44100 \|

sound/soc/tegra/tegra30_i2s.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -320,12 +320,14 @@ static struct snd_soc_dai_ops tegra30_i2s_dai_ops = {
	static const struct snd_soc_dai_driver tegra30_i2s_dai_template = {		static const struct snd_soc_dai_driver tegra30_i2s_dai_template = {
	.probe = tegra30_i2s_probe,		.probe = tegra30_i2s_probe,
	.playback = {		.playback = {
			.stream_name = "Playback",
	.channels_min = 2,		.channels_min = 2,
	.channels_max = 2,		.channels_max = 2,
	.rates = SNDRV_PCM_RATE_8000_96000,		.rates = SNDRV_PCM_RATE_8000_96000,
	.formats = SNDRV_PCM_FMTBIT_S16_LE,		.formats = SNDRV_PCM_FMTBIT_S16_LE,
	},		},
	.capture = {		.capture = {
			.stream_name = "Capture",
	.channels_min = 2,		.channels_min = 2,
	.channels_max = 2,		.channels_max = 2,
	.rates = SNDRV_PCM_RATE_8000_96000,		.rates = SNDRV_PCM_RATE_8000_96000,