add lvds1024*800

hc

2024-01-31 f70575805708cabdedea7498aaa3f710fde4d920

 kernel/sound/soc/rockchip/rockchip_multi_dais.c
..
..
@@ -23,9 +23,18 @@
23
23
 #define DAIS_DRV_NAME		"rockchip-mdais"
24
24
 #define RK3308_GRF_SOC_CON2	0x308
25
25
 
26
+#define SOUND_NAME_PREFIX	"sound-name-prefix"
27
+
26
28
 static inline struct rk_mdais_dev *to_info(struct snd_soc_dai *dai)
27
29
 {
28
30
 	return snd_soc_dai_get_drvdata(dai);
31
+}
32
+
33
+static inline unsigned int *mdais_channel_maps(struct rk_mdais_dev *mdais,
34
+					       struct snd_pcm_substream *substream)
35
+{
36
+	return substream->stream ? mdais->capture_channel_maps :
37
+				   mdais->playback_channel_maps;
29
38
 }
30
39
 
31
40
 static void hw_refine_channels(struct snd_pcm_hw_params *params,
..
..
@@ -52,26 +61,51 @@
52
61
 	if (IS_ERR(cparams))
53
62
 		return PTR_ERR(cparams);
54
63
 
55
-	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
56
-		channel_maps = mdais->playback_channel_maps;
57
-	else
58
-		channel_maps = mdais->capture_channel_maps;
64
+	channel_maps = mdais_channel_maps(mdais, substream);
59
65
 
60
66
 	for (i = 0; i < mdais->num_dais; i++) {
61
67
 		child = mdais->dais[i].dai;
62
-		if (channel_maps[i])
63
-			hw_refine_channels(cparams, channel_maps[i]);
68
+		if (!channel_maps[i])
69
+			continue;
70
+
71
+		hw_refine_channels(cparams, channel_maps[i]);
64
72
 		if (child->driver->ops && child->driver->ops->hw_params) {
65
73
 			ret = child->driver->ops->hw_params(substream, cparams, child);
66
74
 			if (ret < 0) {
67
-				dev_err(dai->dev, "ASoC: can't set %s hw params: %d\n",
75
+				dev_err(dai->dev, "Failed to set %s hw params: %d\n",
68
76
 					dai->name, ret);
69
-				return ret;
77
+				break;
70
78
 			}
71
79
 		}
72
80
 	}
73
81
 
74
82
 	kfree(cparams);
83
+
84
+	return ret;
85
+}
86
+
87
+static int rockchip_mdais_hw_free(struct snd_pcm_substream *substream,
88
+				  struct snd_soc_dai *dai)
89
+{
90
+	struct rk_mdais_dev *mdais = to_info(dai);
91
+	struct snd_soc_dai *child;
92
+	unsigned int *channel_maps;
93
+	int ret = 0, i = 0;
94
+
95
+	channel_maps = mdais_channel_maps(mdais, substream);
96
+
97
+	for (i = 0; i < mdais->num_dais; i++) {
98
+		child = mdais->dais[i].dai;
99
+		if (!channel_maps[i])
100
+			continue;
101
+
102
+		if (child->driver->ops && child->driver->ops->hw_free) {
103
+			ret = child->driver->ops->hw_free(substream, child);
104
+			if (ret < 0)
105
+				return ret;
106
+		}
107
+	}
108
+
75
109
 	return 0;
76
110
 }
77
111
 
..
..
@@ -80,9 +114,16 @@
80
114
 {
81
115
 	struct rk_mdais_dev *mdais = to_info(dai);
82
116
 	struct snd_soc_dai *child;
117
+	unsigned int *channel_maps;
83
118
 	int ret = 0, i = 0;
84
119
 
120
+	channel_maps = mdais_channel_maps(mdais, substream);
121
+
85
122
 	for (i = 0; i < mdais->num_dais; i++) {
123
+		/* skip DAIs which have no channel mapping */
124
+		if (!channel_maps[i])
125
+			continue;
126
+
86
127
 		child = mdais->dais[i].dai;
87
128
 		if (child->driver->ops && child->driver->ops->trigger) {
88
129
 			ret = child->driver->ops->trigger(substream,
..
..
@@ -100,9 +141,15 @@
100
141
 {
101
142
 	struct rk_mdais_dev *mdais = to_info(dai);
102
143
 	struct snd_soc_dai *child;
144
+	unsigned int *channel_maps;
103
145
 	int ret = 0, i = 0;
104
146
 
147
+	channel_maps = mdais_channel_maps(mdais, substream);
148
+
105
149
 	for (i = 0; i < mdais->num_dais; i++) {
150
+		if (!channel_maps[i])
151
+			continue;
152
+
106
153
 		child = mdais->dais[i].dai;
107
154
 		if (child->driver->ops && child->driver->ops->startup) {
108
155
 			ret = child->driver->ops->startup(substream, child);
..
..
@@ -119,9 +166,15 @@
119
166
 {
120
167
 	struct rk_mdais_dev *mdais = to_info(dai);
121
168
 	struct snd_soc_dai *child;
169
+	unsigned int *channel_maps;
122
170
 	int i = 0;
123
171
 
172
+	channel_maps = mdais_channel_maps(mdais, substream);
173
+
124
174
 	for (i = 0; i < mdais->num_dais; i++) {
175
+		if (!channel_maps[i])
176
+			continue;
177
+
125
178
 		child = mdais->dais[i].dai;
126
179
 		if (child->driver->ops && child->driver->ops->shutdown) {
127
180
 			child->driver->ops->shutdown(substream, child);
..
..
@@ -134,9 +187,15 @@
134
187
 {
135
188
 	struct rk_mdais_dev *mdais = to_info(dai);
136
189
 	struct snd_soc_dai *child;
190
+	unsigned int *channel_maps;
137
191
 	int ret = 0, i = 0;
138
192
 
193
+	channel_maps = mdais_channel_maps(mdais, substream);
194
+
139
195
 	for (i = 0; i < mdais->num_dais; i++) {
196
+		if (!channel_maps[i])
197
+			continue;
198
+
140
199
 		child = mdais->dais[i].dai;
141
200
 		if (child->driver->ops && child->driver->ops->prepare) {
142
201
 			ret = child->driver->ops->prepare(substream, child);
..
..
@@ -210,20 +269,38 @@
210
269
 static int rockchip_mdais_dai_probe(struct snd_soc_dai *dai)
211
270
 {
212
271
 	struct rk_mdais_dev *mdais = to_info(dai);
272
+	struct snd_soc_component *comp;
213
273
 	struct snd_soc_dai *child;
274
+	const char *str;
214
275
 	int ret, i = 0;
215
276
 
216
277
 	for (i = 0; i < mdais->num_dais; i++) {
217
278
 		child = mdais->dais[i].dai;
279
+		comp = child->component;
218
280
 		if (!child->probed && child->driver->probe) {
219
-			child->component->card = dai->component->card;
281
+			if (!comp->name_prefix) {
282
+				ret = device_property_read_string(child->dev,
283
+								  SOUND_NAME_PREFIX, &str);
284
+				if (!ret)
285
+					comp->name_prefix = str;
286
+			}
287
+
288
+			comp->card = dai->component->card;
220
289
 			ret = child->driver->probe(child);
221
290
 			if (ret < 0) {
222
291
 				dev_err(child->dev,
223
-					"ASoC: failed to probe DAI %s: %d\n",
292
+					"Failed to probe DAI %s: %d\n",
224
293
 					child->name, ret);
225
294
 				return ret;
226
295
 			}
296
+
297
+			ret = snd_soc_add_component_controls(comp,
298
+							     comp->driver->controls,
299
+							     comp->driver->num_controls);
300
+			if (ret)
301
+				dev_err(dai->dev, "%s: Failed to add controls, should add '%s' in DT\n",
302
+					dev_name(child->dev), SOUND_NAME_PREFIX);
303
+
227
304
 			dai->probed = 1;
228
305
 		}
229
306
 	}
..
..
@@ -233,6 +310,7 @@
233
310
 
234
311
 static const struct snd_soc_dai_ops rockchip_mdais_dai_ops = {
235
312
 	.hw_params = rockchip_mdais_hw_params,
313
+	.hw_free = rockchip_mdais_hw_free,
236
314
 	.set_sysclk = rockchip_mdais_set_sysclk,
237
315
 	.set_fmt = rockchip_mdais_set_fmt,
238
316
 	.set_tdm_slot = rockchip_mdais_tdm_slot,
..
..
@@ -258,7 +336,7 @@
258
336
 
259
337
 	dai_component.of_node = np;
260
338
 
261
-	return snd_soc_find_dai(&dai_component);
339
+	return snd_soc_find_dai_with_mutex(&dai_component);
262
340
 }
263
341
 
264
342
 static int mdais_runtime_suspend(struct device *dev)
..
..
@@ -373,9 +451,9 @@
373
451
 		.probe = rockchip_mdais_dai_probe,
374
452
 		.playback = {
375
453
 			.stream_name = "Playback",
376
-			.channels_min = 2,
377
-			.channels_max = 32,
378
-			.rates = SNDRV_PCM_RATE_8000_192000,
454
+			.channels_min = 1,
455
+			.channels_max = 512,
456
+			.rates = SNDRV_PCM_RATE_8000_384000,
379
457
 			.formats = (SNDRV_PCM_FMTBIT_S8 |
380
458
 				    SNDRV_PCM_FMTBIT_S16_LE |
381
459
 				    SNDRV_PCM_FMTBIT_S20_3LE |
..
..
@@ -384,9 +462,9 @@
384
462
 		},
385
463
 		.capture = {
386
464
 			.stream_name = "Capture",
387
-			.channels_min = 2,
388
-			.channels_max = 32,
389
-			.rates = SNDRV_PCM_RATE_8000_192000,
465
+			.channels_min = 1,
466
+			.channels_max = 512,
467
+			.rates = SNDRV_PCM_RATE_8000_384000,
390
468
 			.formats = (SNDRV_PCM_FMTBIT_S8 |
391
469
 				    SNDRV_PCM_FMTBIT_S16_LE |
392
470
 				    SNDRV_PCM_FMTBIT_S20_3LE |