add lvds1024*800

hc

2024-01-31 f70575805708cabdedea7498aaa3f710fde4d920

 kernel/sound/soc/samsung/speyside.c
..
..
@@ -1,13 +1,8 @@
1
-/*
2
- * Speyside audio support
3
- *
4
- * Copyright 2011 Wolfson Microelectronics
5
- *
6
- * This program is free software; you can redistribute  it and/or modify it
7
- * under  the terms of  the GNU General  Public License as published by the
8
- * Free Software Foundation;  either version 2 of the  License, or (at your
9
- * option) any later version.
10
- */
1
+// SPDX-License-Identifier: GPL-2.0+
2
+//
3
+// Speyside audio support
4
+//
5
+// Copyright 2011 Wolfson Microelectronics
11
6
 
12
7
 #include <sound/soc.h>
13
8
 #include <sound/soc-dapm.h>
..
..
@@ -29,8 +24,8 @@
29
24
 	struct snd_soc_dai *codec_dai;
30
25
 	int ret;
31
26
 
32
-	rtd = snd_soc_get_pcm_runtime(card, card->dai_link[1].name);
33
-	codec_dai = rtd->codec_dai;
27
+	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[1]);
28
+	codec_dai = asoc_rtd_to_codec(rtd, 0);
34
29
 
35
30
 	if (dapm->dev != codec_dai->dev)
36
31
 		return 0;
..
..
@@ -65,8 +60,8 @@
65
60
 	struct snd_soc_dai *codec_dai;
66
61
 	int ret;
67
62
 
68
-	rtd = snd_soc_get_pcm_runtime(card, card->dai_link[1].name);
69
-	codec_dai = rtd->codec_dai;
63
+	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[1]);
64
+	codec_dai = asoc_rtd_to_codec(rtd, 0);
70
65
 
71
66
 	if (dapm->dev != codec_dai->dev)
72
67
 		return 0;
..
..
@@ -136,7 +131,7 @@
136
131
 
137
132
 static int speyside_wm0010_init(struct snd_soc_pcm_runtime *rtd)
138
133
 {
139
-	struct snd_soc_dai *dai = rtd->codec_dai;
134
+	struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0);
140
135
 	int ret;
141
136
 
142
137
 	ret = snd_soc_dai_set_sysclk(dai, 0, MCLK_AUDIO_RATE, 0);
..
..
@@ -148,7 +143,7 @@
148
143
 
149
144
 static int speyside_wm8996_init(struct snd_soc_pcm_runtime *rtd)
150
145
 {
151
-	struct snd_soc_dai *dai = rtd->codec_dai;
146
+	struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0);
152
147
 	struct snd_soc_component *component = dai->component;
153
148
 	int ret;
154
149
 
..
..
@@ -194,39 +189,45 @@
194
189
 	.channels_max = 2,
195
190
 };
196
191
 
192
+SND_SOC_DAILINK_DEFS(cpu_dsp,
193
+	DAILINK_COMP_ARRAY(COMP_CPU("samsung-i2s.0")),
194
+	DAILINK_COMP_ARRAY(COMP_CODEC("spi0.0", "wm0010-sdi1")),
195
+	DAILINK_COMP_ARRAY(COMP_PLATFORM("samsung-i2s.0")));
196
+
197
+SND_SOC_DAILINK_DEFS(dsp_codec,
198
+	DAILINK_COMP_ARRAY(COMP_CPU("wm0010-sdi2")),
199
+	DAILINK_COMP_ARRAY(COMP_CODEC("wm8996.1-001a", "wm8996-aif1")));
200
+
201
+SND_SOC_DAILINK_DEFS(baseband,
202
+	DAILINK_COMP_ARRAY(COMP_CPU("wm8996-aif2")),
203
+	DAILINK_COMP_ARRAY(COMP_CODEC("wm1250-ev1.1-0027", "wm1250-ev1")));
204
+
197
205
 static struct snd_soc_dai_link speyside_dai[] = {
198
206
 	{
199
207
 		.name = "CPU-DSP",
200
208
 		.stream_name = "CPU-DSP",
201
-		.cpu_dai_name = "samsung-i2s.0",
202
-		.codec_dai_name = "wm0010-sdi1",
203
-		.platform_name = "samsung-i2s.0",
204
-		.codec_name = "spi0.0",
205
209
 		.init = speyside_wm0010_init,
206
210
 		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
207
211
 				| SND_SOC_DAIFMT_CBM_CFM,
212
+		SND_SOC_DAILINK_REG(cpu_dsp),
208
213
 	},
209
214
 	{
210
215
 		.name = "DSP-CODEC",
211
216
 		.stream_name = "DSP-CODEC",
212
-		.cpu_dai_name = "wm0010-sdi2",
213
-		.codec_dai_name = "wm8996-aif1",
214
-		.codec_name = "wm8996.1-001a",
215
217
 		.init = speyside_wm8996_init,
216
218
 		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
217
219
 				| SND_SOC_DAIFMT_CBM_CFM,
218
220
 		.params = &dsp_codec_params,
219
221
 		.ignore_suspend = 1,
222
+		SND_SOC_DAILINK_REG(dsp_codec),
220
223
 	},
221
224
 	{
222
225
 		.name = "Baseband",
223
226
 		.stream_name = "Baseband",
224
-		.cpu_dai_name = "wm8996-aif2",
225
-		.codec_dai_name = "wm1250-ev1",
226
-		.codec_name = "wm1250-ev1.1-0027",
227
227
 		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
228
228
 				| SND_SOC_DAIFMT_CBM_CFM,
229
229
 		.ignore_suspend = 1,
230
+		SND_SOC_DAILINK_REG(baseband),
230
231
 	},
231
232
 };
232
233
 
..
..
@@ -239,15 +240,14 @@
239
240
 
240
241
 static struct snd_soc_aux_dev speyside_aux_dev[] = {
241
242
 	{
242
-		.name = "wm9081",
243
-		.codec_name = "wm9081.1-006c",
243
+		.dlc = COMP_AUX("wm9081.1-006c"),
244
244
 		.init = speyside_wm9081_init,
245
245
 	},
246
246
 };
247
247
 
248
248
 static struct snd_soc_codec_conf speyside_codec_conf[] = {
249
249
 	{
250
-		.dev_name = "wm9081.1-006c",
250
+		.dlc = COMP_CODEC_CONF("wm9081.1-006c"),
251
251
 		.name_prefix = "Sub",
252
252
 	},
253
253
 };
..
..
@@ -331,8 +331,7 @@
331
331
 
332
332
 	ret = devm_snd_soc_register_card(&pdev->dev, card);
333
333
 	if (ret)
334
-		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
335
-			ret);
334
+		dev_err_probe(&pdev->dev, ret, "snd_soc_register_card() failed\n");
336
335
 
337
336
 	return ret;
338
337
 }