ASoC: Blackfin: push down SPORT settings from global variables

Now that we have multi-component support, take the time to unify the
SPORT implementations a bit and make the setup dynamic.  This kills
off the global sport_handle which was shared across all the Blackfin
machine drivers.  The pin management aspect is off loaded to platform
resources, and now multiple SPORTs can be instantiated simultaneously.

Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Scott Jiang <scott.jiang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 20 insertions, 20 deletions

diff --git a/sound/soc/blackfin/bf5xx-ad1836.c b/sound/soc/blackfin/bf5xx-ad1836.c
index 5d9d9e2805b8..ea4951cf5526 100644
--- a/sound/soc/blackfin/bf5xx-ad1836.c
+++ b/sound/soc/blackfin/bf5xx-ad1836.c
@@ -29,22 +29,12 @@
 #include <asm/portmux.h>
 
 #include "../codecs/ad1836.h"
-#include "bf5xx-sport.h"
 
 #include "bf5xx-tdm-pcm.h"
 #include "bf5xx-tdm.h"
 
 static struct snd_soc_card bf5xx_ad1836;
 
-static int bf5xx_ad1836_startup(struct snd_pcm_substream *substream)
-{
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-
-        snd_soc_dai_set_drvdata(cpu_dai, sport_handle);
-        return 0;
-}
-
 static int bf5xx_ad1836_hw_params(struct snd_pcm_substream *substream,
         struct snd_pcm_hw_params *params)
 {
@@ -75,23 +65,33 @@ static int bf5xx_ad1836_hw_params(struct snd_pcm_substream *substream,
 }
 
 static struct snd_soc_ops bf5xx_ad1836_ops = {
-        .startup = bf5xx_ad1836_startup,
         .hw_params = bf5xx_ad1836_hw_params,
 };
 
-static struct snd_soc_dai_link bf5xx_ad1836_dai = {
-        .name = "ad1836",
-        .stream_name = "AD1836",
-        .cpu_dai_name = "bfin-tdm",
-        .codec_dai_name = "ad1836-hifi",
-        .platform_name = "bfin-tdm-pcm-audio",
-        .codec_name = "ad1836.0",
-        .ops = &bf5xx_ad1836_ops,
+static struct snd_soc_dai_link bf5xx_ad1836_dai[] = {
+        {
+                .name = "ad1836",
+                .stream_name = "AD1836",
+                .cpu_dai_name = "bfin-tdm.0",
+                .codec_dai_name = "ad1836-hifi",
+                .platform_name = "bfin-tdm-pcm-audio",
+                .codec_name = "ad1836.0",
+                .ops = &bf5xx_ad1836_ops,
+        },
+        {
+                .name = "ad1836",
+                .stream_name = "AD1836",
+                .cpu_dai_name = "bfin-tdm.1",
+                .codec_dai_name = "ad1836-hifi",
+                .platform_name = "bfin-tdm-pcm-audio",
+                .codec_name = "ad1836.0",
+                .ops = &bf5xx_ad1836_ops,
+        },
 };
 
 static struct snd_soc_card bf5xx_ad1836 = {
         .name = "bfin-ad1836",
-        .dai_link = &bf5xx_ad1836_dai,
+        .dai_link = &bf5xx_ad1836_dai[CONFIG_SND_BF5XX_SPORT_NUM],
         .num_links = 1,
 };