diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-06-06 19:15:07 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-07 19:02:28 -0400 |
commit | 9515c1010c98347ec92d923bd3e23793fa6dc6fe (patch) | |
tree | 05045cb125a772af74229332adbe8f3af17303d1 /sound/soc/tegra | |
parent | d392dead724935ad45c42e1a802d0f1de478c0d2 (diff) |
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>
Diffstat (limited to 'sound/soc/tegra')
-rw-r--r-- | sound/soc/tegra/tegra20_i2s.c | 2 | ||||
-rw-r--r-- | sound/soc/tegra/tegra20_spdif.c | 1 | ||||
-rw-r--r-- | sound/soc/tegra/tegra30_i2s.c | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c index 0c7af63d444b..9d5d4704da29 100644 --- a/sound/soc/tegra/tegra20_i2s.c +++ b/sound/soc/tegra/tegra20_i2s.c | |||
@@ -261,12 +261,14 @@ static const struct snd_soc_dai_ops tegra20_i2s_dai_ops = { | |||
261 | static const struct snd_soc_dai_driver tegra20_i2s_dai_template = { | 261 | static const struct snd_soc_dai_driver tegra20_i2s_dai_template = { |
262 | .probe = tegra20_i2s_probe, | 262 | .probe = tegra20_i2s_probe, |
263 | .playback = { | 263 | .playback = { |
264 | .stream_name = "Playback", | ||
264 | .channels_min = 2, | 265 | .channels_min = 2, |
265 | .channels_max = 2, | 266 | .channels_max = 2, |
266 | .rates = SNDRV_PCM_RATE_8000_96000, | 267 | .rates = SNDRV_PCM_RATE_8000_96000, |
267 | .formats = SNDRV_PCM_FMTBIT_S16_LE, | 268 | .formats = SNDRV_PCM_FMTBIT_S16_LE, |
268 | }, | 269 | }, |
269 | .capture = { | 270 | .capture = { |
271 | .stream_name = "Capture", | ||
270 | .channels_min = 2, | 272 | .channels_min = 2, |
271 | .channels_max = 2, | 273 | .channels_max = 2, |
272 | .rates = SNDRV_PCM_RATE_8000_96000, | 274 | .rates = SNDRV_PCM_RATE_8000_96000, |
diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c index f9b57418bd08..ffbd99c4106e 100644 --- a/sound/soc/tegra/tegra20_spdif.c +++ b/sound/soc/tegra/tegra20_spdif.c | |||
@@ -181,6 +181,7 @@ static struct snd_soc_dai_driver tegra20_spdif_dai = { | |||
181 | .name = DRV_NAME, | 181 | .name = DRV_NAME, |
182 | .probe = tegra20_spdif_probe, | 182 | .probe = tegra20_spdif_probe, |
183 | .playback = { | 183 | .playback = { |
184 | .stream_name = "Playback", | ||
184 | .channels_min = 2, | 185 | .channels_min = 2, |
185 | .channels_max = 2, | 186 | .channels_max = 2, |
186 | .rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | | 187 | .rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | |
diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c index 8596032985dc..9c5c0e6819eb 100644 --- a/sound/soc/tegra/tegra30_i2s.c +++ b/sound/soc/tegra/tegra30_i2s.c | |||
@@ -320,12 +320,14 @@ static struct snd_soc_dai_ops tegra30_i2s_dai_ops = { | |||
320 | static const struct snd_soc_dai_driver tegra30_i2s_dai_template = { | 320 | static const struct snd_soc_dai_driver tegra30_i2s_dai_template = { |
321 | .probe = tegra30_i2s_probe, | 321 | .probe = tegra30_i2s_probe, |
322 | .playback = { | 322 | .playback = { |
323 | .stream_name = "Playback", | ||
323 | .channels_min = 2, | 324 | .channels_min = 2, |
324 | .channels_max = 2, | 325 | .channels_max = 2, |
325 | .rates = SNDRV_PCM_RATE_8000_96000, | 326 | .rates = SNDRV_PCM_RATE_8000_96000, |
326 | .formats = SNDRV_PCM_FMTBIT_S16_LE, | 327 | .formats = SNDRV_PCM_FMTBIT_S16_LE, |
327 | }, | 328 | }, |
328 | .capture = { | 329 | .capture = { |
330 | .stream_name = "Capture", | ||
329 | .channels_min = 2, | 331 | .channels_min = 2, |
330 | .channels_max = 2, | 332 | .channels_max = 2, |
331 | .rates = SNDRV_PCM_RATE_8000_96000, | 333 | .rates = SNDRV_PCM_RATE_8000_96000, |