From 6a9f10250d8bd6c3b66c6c64e367e5f9b005232e Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Wed, 6 Jun 2012 17:15:07 -0600
Subject: [PATCH] --- yaml --- r: 316219 b: refs/heads/master c:
 9515c1010c98347ec92d923bd3e23793fa6dc6fe h: refs/heads/master i:   316217:
 a33fda8b0661e690df952c3e09c5e7f8ce26457e   316215:
 7697c3ce4d6a157937f235816f7a4b8d0ebb6796 v: v3

---
 [refs]                                | 2 +-
 trunk/sound/soc/tegra/tegra20_i2s.c   | 2 ++
 trunk/sound/soc/tegra/tegra20_spdif.c | 1 +
 trunk/sound/soc/tegra/tegra30_i2s.c   | 2 ++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0eab664fac1d..a42a76bcb75b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d392dead724935ad45c42e1a802d0f1de478c0d2
+refs/heads/master: 9515c1010c98347ec92d923bd3e23793fa6dc6fe
diff --git a/trunk/sound/soc/tegra/tegra20_i2s.c b/trunk/sound/soc/tegra/tegra20_i2s.c
index 0c7af63d444b..9d5d4704da29 100644
--- a/trunk/sound/soc/tegra/tegra20_i2s.c
+++ b/trunk/sound/soc/tegra/tegra20_i2s.c
@@ -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 = {
 	.probe = tegra20_i2s_probe,
 	.playback = {
+		.stream_name = "Playback",
 		.channels_min = 2,
 		.channels_max = 2,
 		.rates = SNDRV_PCM_RATE_8000_96000,
 		.formats = SNDRV_PCM_FMTBIT_S16_LE,
 	},
 	.capture = {
+		.stream_name = "Capture",
 		.channels_min = 2,
 		.channels_max = 2,
 		.rates = SNDRV_PCM_RATE_8000_96000,
diff --git a/trunk/sound/soc/tegra/tegra20_spdif.c b/trunk/sound/soc/tegra/tegra20_spdif.c
index f9b57418bd08..ffbd99c4106e 100644
--- a/trunk/sound/soc/tegra/tegra20_spdif.c
+++ b/trunk/sound/soc/tegra/tegra20_spdif.c
@@ -181,6 +181,7 @@ static struct snd_soc_dai_driver tegra20_spdif_dai = {
 	.name = DRV_NAME,
 	.probe = tegra20_spdif_probe,
 	.playback = {
+		.stream_name = "Playback",
 		.channels_min = 2,
 		.channels_max = 2,
 		.rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |
diff --git a/trunk/sound/soc/tegra/tegra30_i2s.c b/trunk/sound/soc/tegra/tegra30_i2s.c
index 8596032985dc..9c5c0e6819eb 100644
--- a/trunk/sound/soc/tegra/tegra30_i2s.c
+++ b/trunk/sound/soc/tegra/tegra30_i2s.c
@@ -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 = {
 	.probe = tegra30_i2s_probe,
 	.playback = {
+		.stream_name = "Playback",
 		.channels_min = 2,
 		.channels_max = 2,
 		.rates = SNDRV_PCM_RATE_8000_96000,
 		.formats = SNDRV_PCM_FMTBIT_S16_LE,
 	},
 	.capture = {
+		.stream_name = "Capture",
 		.channels_min = 2,
 		.channels_max = 2,
 		.rates = SNDRV_PCM_RATE_8000_96000,