Diff
Modified: trunk/sound/soc/blackfin/bf5xx-ad183x.c (9636 => 9637)
--- trunk/sound/soc/blackfin/bf5xx-ad183x.c 2011-03-01 09:43:50 UTC (rev 9636)
+++ trunk/sound/soc/blackfin/bf5xx-ad183x.c 2011-03-01 09:47:32 UTC (rev 9637)
@@ -70,19 +70,30 @@
.hw_params = bf5xx_ad183x_hw_params,
};
-static struct snd_soc_dai_link bf5xx_ad183x_dai = {
- .name = "ad183x",
- .stream_name = "AD183X",
- .cpu_dai_name = "bfin-tdm.0",
- .codec_dai_name = "ad183x-hifi",
- .platform_name = "bfin-pcm-audio",
- .codec_name = "spi0.4",
- .ops = &bf5xx_ad183x_ops,
+static struct snd_soc_dai_link bf5xx_ad183x_dai[] = {
+ {
+ .name = "ad183x",
+ .stream_name = "AD183X",
+ .cpu_dai_name = "bfin-tdm.0",
+ .codec_dai_name = "ad183x-hifi",
+ .platform_name = "bfin-pcm-audio",
+ .codec_name = "spi0.4",
+ .ops = &bf5xx_ad183x_ops,
+ },
+ {
+ .name = "ad183x",
+ .stream_name = "AD183X",
+ .cpu_dai_name = "bfin-tdm.1",
+ .codec_dai_name = "ad183x-hifi",
+ .platform_name = "bfin-pcm-audio",
+ .codec_name = "spi0.4",
+ .ops = &bf5xx_ad183x_ops,
+ }
};
static struct snd_soc_card bf5xx_ad183x = {
.name = "bf5xx_ad183x",
- .dai_link = &bf5xx_ad183x_dai,
+ .dai_link = &bf5xx_ad183x_dai[CONFIG_SND_BF5XX_SPORT_NUM],
.num_links = 1,
};
Modified: trunk/sound/soc/blackfin/bf5xx-ad193x.c (9636 => 9637)
--- trunk/sound/soc/blackfin/bf5xx-ad193x.c 2011-03-01 09:43:50 UTC (rev 9636)
+++ trunk/sound/soc/blackfin/bf5xx-ad193x.c 2011-03-01 09:47:32 UTC (rev 9637)
@@ -84,23 +84,38 @@
.hw_params = bf5xx_ad193x_hw_params,
};
-static struct snd_soc_dai_link bf5xx_ad193x_dai = {
- .name = "ad193x",
- .stream_name = "AD193X",
- .cpu_dai_name = "bfin-tdm.0",
- .codec_dai_name ="ad193x-hifi",
- .platform_name = "bfin-pcm-audio",
+static struct snd_soc_dai_link bf5xx_ad193x_dai[] = {
+ {
+ .name = "ad193x",
+ .stream_name = "AD193X",
+ .cpu_dai_name = "bfin-tdm.0",
+ .codec_dai_name = "ad193x-hifi",
+ .platform_name = "bfin-pcm-audio",
#if defined(CONFIG_SND_SOC_AD193X_SPI)
- .codec_name = "spi0.5",
+ .codec_name = "spi0.5",
#elif defined(CONFIG_SND_SOC_AD193X_I2C)
- .codec_name = "ad193x-codec.0-0004",
+ .codec_name = "ad193x-codec.0-0004",
#endif
- .ops = &bf5xx_ad193x_ops,
+ .ops = &bf5xx_ad193x_ops,
+ },
+ {
+ .name = "ad193x",
+ .stream_name = "AD193X",
+ .cpu_dai_name = "bfin-tdm.1",
+ .codec_dai_name = "ad193x-hifi",
+ .platform_name = "bfin-pcm-audio",
+#if defined(CONFIG_SND_SOC_AD193X_SPI)
+ .codec_name = "spi0.5",
+#elif defined(CONFIG_SND_SOC_AD193X_I2C)
+ .codec_name = "ad193x-codec.0-0004",
+#endif
+ .ops = &bf5xx_ad193x_ops,
+ }
};
static struct snd_soc_card bf5xx_ad193x = {
.name = "bf5xx_ad193x",
- .dai_link = &bf5xx_ad193x_dai,
+ .dai_link = &bf5xx_ad193x_dai[CONFIG_SND_BF5XX_SPORT_NUM],
.num_links = 1,
};
Modified: trunk/sound/soc/blackfin/bf5xx-ssm2602.c (9636 => 9637)
--- trunk/sound/soc/blackfin/bf5xx-ssm2602.c 2011-03-01 09:43:50 UTC (rev 9636)
+++ trunk/sound/soc/blackfin/bf5xx-ssm2602.c 2011-03-01 09:47:32 UTC (rev 9637)
@@ -103,19 +103,30 @@
.hw_params = bf5xx_ssm2602_hw_params,
};
-static struct snd_soc_dai_link bf5xx_ssm2602_dai = {
- .name = "ssm2602",
- .stream_name = "SSM2602",
- .cpu_dai_name = "bfin-i2s.0",
- .codec_dai_name = "ssm2602-hifi",
- .platform_name = "bfin-pcm-audio",
- .codec_name = "ssm2602-codec.0-001b",
- .ops = &bf5xx_ssm2602_ops,
+static struct snd_soc_dai_link bf5xx_ssm2602_dai[] = {
+ {
+ .name = "ssm2602",
+ .stream_name = "SSM2602",
+ .cpu_dai_name = "bfin-i2s.0",
+ .codec_dai_name = "ssm2602-hifi",
+ .platform_name = "bfin-pcm-audio",
+ .codec_name = "ssm2602-codec.0-001b",
+ .ops = &bf5xx_ssm2602_ops,
+ },
+ {
+ .name = "ssm2602",
+ .stream_name = "SSM2602",
+ .cpu_dai_name = "bfin-i2s.1",
+ .codec_dai_name = "ssm2602-hifi",
+ .platform_name = "bfin-pcm-audio",
+ .codec_name = "ssm2602-codec.0-001b",
+ .ops = &bf5xx_ssm2602_ops,
+ }
};
static struct snd_soc_card bf5xx_ssm2602 = {
.name = "bf5xx_ssm2602",
- .dai_link = &bf5xx_ssm2602_dai,
+ .dai_link = &bf5xx_ssm2602_dai[CONFIG_SND_BF5XX_SPORT_NUM],
.num_links = 1,
};
