From 8f99b0ccbb8a32545d3072021561c845ba17acc3 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@armlinux.org.uk>
Date: Tue, 27 Sep 2016 19:52:38 +0100
Subject: update

---
 sound/soc/sa11x0/assabet.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/sound/soc/sa11x0/assabet.c b/sound/soc/sa11x0/assabet.c
index d6c9cbefc1f6..5b11856d5abf 100644
--- a/sound/soc/sa11x0/assabet.c
+++ b/sound/soc/sa11x0/assabet.c
@@ -272,16 +272,18 @@ static struct snd_soc_ops assabet_asoc_ops = {
 	.shutdown = assabet_asoc_shutdown,
 };
 
-static struct snd_soc_dai_link assabet_asoc_dai = {
-	.name = "Assabet",
-	.stream_name = "assabet-ssp",
-	.codec_name = "uda134x-codec",
-	.platform_name = "sa11x0-ssp",
-	.cpu_dai_name = "sa11x0-ssp",
-	.codec_dai_name = "uda134x-hifi",
-	.ops = &assabet_asoc_ops,
-	.dai_fmt = SND_SOC_DAIFMT_RIGHT_J | SND_SOC_DAIFMT_NB_NF |
-		   SND_SOC_DAIFMT_CBS_CFS,
+static struct snd_soc_dai_link assabet_asoc_dais[] = {
+	{
+		.name = "Assabet",
+		.stream_name = "System Playback/Capture",
+		.cpu_dai_name = "sa11x0-ssp",
+		.codec_name = "uda134x-codec",
+		.codec_dai_name = "uda134x-hifi",
+		.platform_name = "sa11x0-ssp",
+		.dai_fmt = SND_SOC_DAIFMT_RIGHT_J | SND_SOC_DAIFMT_NB_NF |
+			   SND_SOC_DAIFMT_CBS_CFS,
+		.ops = &assabet_asoc_ops,
+	},
 };
 
 static int
@@ -307,8 +309,8 @@ static const struct snd_soc_dapm_route assabet_dapm_routes[] = {
 static struct snd_soc_card snd_soc_assabet = {
 	.name = "Assabet",
 	.resume_pre = assabet_asoc_resume_pre,
-	.dai_link = &assabet_asoc_dai,
-	.num_links = 1,
+	.dai_link = assabet_asoc_dais,
+	.num_links = ARRAY_SIZE(assabet_asoc_dais),
 	.dapm_widgets = assabet_dapm_widgets,
 	.num_dapm_widgets = ARRAY_SIZE(assabet_dapm_widgets),
 	.dapm_routes = assabet_dapm_routes,
@@ -470,7 +472,7 @@ static int assabet_init(void)
 	local_irq_restore(flags);
 
 	soc = platform_device_alloc("assabet-asoc", -1);
-	uda = platform_device_alloc(assabet_asoc_dai.codec_name, -1);
+	uda = platform_device_alloc(assabet_asoc_dais[0].codec_name, -1);
 	dma = platform_device_alloc("soc-dmaengine", -1);
 	if (!soc || !uda || !dma) {
 		ret = -ENOMEM;
-- 
cgit