Skip to content

Commit a044708

Browse files
committed
ASoC: SOF: remove dai capabilities from dai definitions
Dai capabilities/configuration are defined in topology. The capabilities defined in the dai drv for the resp platforms don't seem to be used at all. As an additional benefit, removing these cleans up the DAPM graph. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
1 parent f147f56 commit a044708

4 files changed

Lines changed: 0 additions & 98 deletions

File tree

‎sound/soc/sof/intel/bdw.c‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -640,24 +640,13 @@ static int bdw_probe(struct snd_sof_dev *sdev)
640640
return ret;
641641
}
642642

643-
#define BDW_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE | \
644-
SNDRV_PCM_FMTBIT_S32_LE)
645-
646643
/* Broadwell DAIs */
647644
static struct snd_soc_dai_driver bdw_dai[] = {
648645
{
649646
.name = "ssp0-port",
650-
.playback = SOF_DAI_STREAM("ssp0 Tx", 1, 8,
651-
SNDRV_PCM_RATE_8000_192000, BDW_FORMATS),
652-
.capture = SOF_DAI_STREAM("ssp0 Rx", 1, 8,
653-
SNDRV_PCM_RATE_8000_192000, BDW_FORMATS),
654647
},
655648
{
656649
.name = "ssp1-port",
657-
.playback = SOF_DAI_STREAM("ssp1 Tx", 1, 8,
658-
SNDRV_PCM_RATE_8000_192000, BDW_FORMATS),
659-
.capture = SOF_DAI_STREAM("ssp1 Rx", 1, 8,
660-
SNDRV_PCM_RATE_8000_192000, BDW_FORMATS),
661650
},
662651
};
663652

‎sound/soc/sof/intel/byt.c‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -485,52 +485,25 @@ static int byt_reset(struct snd_sof_dev *sdev)
485485
return 0;
486486
}
487487

488-
#define BYT_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE | \
489-
SNDRV_PCM_FMTBIT_S32_LE)
490-
491488
/* Baytrail DAIs */
492489
static struct snd_soc_dai_driver byt_dai[] = {
493490
{
494491
.name = "ssp0-port",
495-
.playback = SOF_DAI_STREAM("ssp0 Tx", 1, 8,
496-
SNDRV_PCM_RATE_8000_192000, BYT_FORMATS),
497-
.capture = SOF_DAI_STREAM("ssp0 Rx", 1, 8,
498-
SNDRV_PCM_RATE_8000_192000, BYT_FORMATS),
499492
},
500493
{
501494
.name = "ssp1-port",
502-
.playback = SOF_DAI_STREAM("ssp1 Tx", 1, 8,
503-
SNDRV_PCM_RATE_8000_192000, BYT_FORMATS),
504-
.capture = SOF_DAI_STREAM("ssp1 Rx", 1, 8,
505-
SNDRV_PCM_RATE_8000_192000, BYT_FORMATS),
506495
},
507496
{
508497
.name = "ssp2-port",
509-
.playback = SOF_DAI_STREAM("ssp2 Tx", 1, 8,
510-
SNDRV_PCM_RATE_8000_192000, BYT_FORMATS),
511-
.capture = SOF_DAI_STREAM("ssp2 Rx", 1, 8,
512-
SNDRV_PCM_RATE_8000_192000, BYT_FORMATS),
513498
},
514499
{
515500
.name = "ssp3-port",
516-
.playback = SOF_DAI_STREAM("ssp3 Tx", 1, 8,
517-
SNDRV_PCM_RATE_8000_192000, BYT_FORMATS),
518-
.capture = SOF_DAI_STREAM("ssp3 Rx", 1, 8,
519-
SNDRV_PCM_RATE_8000_192000, BYT_FORMATS),
520501
},
521502
{
522503
.name = "ssp4-port",
523-
.playback = SOF_DAI_STREAM("ssp4 Tx", 1, 8,
524-
SNDRV_PCM_RATE_8000_192000, BYT_FORMATS),
525-
.capture = SOF_DAI_STREAM("ssp4 Rx", 1, 8,
526-
SNDRV_PCM_RATE_8000_192000, BYT_FORMATS),
527504
},
528505
{
529506
.name = "ssp5-port",
530-
.playback = SOF_DAI_STREAM("ssp5 Tx", 1, 8,
531-
SNDRV_PCM_RATE_8000_192000, BYT_FORMATS),
532-
.capture = SOF_DAI_STREAM("ssp5 Rx", 1, 8,
533-
SNDRV_PCM_RATE_8000_192000, BYT_FORMATS),
534507
},
535508
};
536509

‎sound/soc/sof/intel/hda-dai.c‎

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
#include "../sof-priv.h"
1414
#include "hda.h"
1515

16-
#define SKL_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE | \
17-
SNDRV_PCM_FMTBIT_S32_LE)
18-
1916
#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
2017

2118
struct hda_pipe_params {
@@ -265,98 +262,52 @@ static const struct snd_soc_dai_ops hda_link_dai_ops = {
265262
struct snd_soc_dai_driver skl_dai[] = {
266263
{
267264
.name = "SSP0 Pin",
268-
.playback = SOF_DAI_STREAM("ssp0 Tx", 1, 8,
269-
SNDRV_PCM_RATE_8000_192000, SKL_FORMATS),
270-
.capture = SOF_DAI_STREAM("ssp0 Rx", 1, 8,
271-
SNDRV_PCM_RATE_8000_192000, SKL_FORMATS),
272265
},
273266
{
274267
.name = "SSP1 Pin",
275-
.playback = SOF_DAI_STREAM("ssp1 Tx", 1, 8,
276-
SNDRV_PCM_RATE_8000_192000, SKL_FORMATS),
277-
.capture = SOF_DAI_STREAM("ssp1 Rx", 1, 8,
278-
SNDRV_PCM_RATE_8000_192000, SKL_FORMATS),
279268
},
280269
{
281270
.name = "SSP2 Pin",
282-
.playback = SOF_DAI_STREAM("ssp2 Tx", 1, 8,
283-
SNDRV_PCM_RATE_8000_192000, SKL_FORMATS),
284-
.capture = SOF_DAI_STREAM("ssp2 Rx", 1, 8,
285-
SNDRV_PCM_RATE_8000_192000, SKL_FORMATS),
286271
},
287272
{
288273
.name = "SSP3 Pin",
289-
.playback = SOF_DAI_STREAM("ssp3 Tx", 1, 8,
290-
SNDRV_PCM_RATE_8000_192000, SKL_FORMATS),
291-
.capture = SOF_DAI_STREAM("ssp3 Rx", 1, 8,
292-
SNDRV_PCM_RATE_8000_192000, SKL_FORMATS),
293274
},
294275
{
295276
.name = "SSP4 Pin",
296-
.playback = SOF_DAI_STREAM("ssp4 Tx", 1, 8,
297-
SNDRV_PCM_RATE_8000_192000, SKL_FORMATS),
298-
.capture = SOF_DAI_STREAM("ssp4 Rx", 1, 8,
299-
SNDRV_PCM_RATE_8000_192000, SKL_FORMATS),
300277
},
301278
{
302279
.name = "SSP5 Pin",
303-
.playback = SOF_DAI_STREAM("ssp5 Tx", 1, 8,
304-
SNDRV_PCM_RATE_8000_192000, SKL_FORMATS),
305-
.capture = SOF_DAI_STREAM("ssp5 Rx", 1, 8,
306-
SNDRV_PCM_RATE_8000_192000, SKL_FORMATS),
307280
},
308281
{
309282
.name = "DMIC01 Pin",
310-
.capture = SOF_DAI_STREAM("DMIC01 Rx", 1, 4,
311-
SNDRV_PCM_RATE_8000_192000, SKL_FORMATS),
312283
},
313284
{
314285
.name = "DMIC16k Pin",
315-
.capture = SOF_DAI_STREAM("DMIC16k Rx", 1, 4,
316-
SNDRV_PCM_RATE_16000, SKL_FORMATS),
317286
},
318287
#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
319288
{
320289
.name = "iDisp1 Pin",
321290
.ops = &hda_link_dai_ops,
322-
.playback = SOF_DAI_STREAM("iDisp1 Tx", 1, 8,
323-
SNDRV_PCM_RATE_8000_192000, SKL_FORMATS),
324291
},
325292
{
326293
.name = "iDisp2 Pin",
327294
.ops = &hda_link_dai_ops,
328-
.playback = SOF_DAI_STREAM("iDisp2 Tx", 1, 8,
329-
SNDRV_PCM_RATE_8000_192000, SKL_FORMATS),
330295
},
331296
{
332297
.name = "iDisp3 Pin",
333298
.ops = &hda_link_dai_ops,
334-
.playback = SOF_DAI_STREAM("iDisp3 Tx", 1, 8,
335-
SNDRV_PCM_RATE_8000_192000, SKL_FORMATS),
336299
},
337300
{
338301
.name = "Analog CPU DAI",
339302
.ops = &hda_link_dai_ops,
340-
.playback = SOF_DAI_STREAM("Analog CPU Playback", 1, 16,
341-
SNDRV_PCM_RATE_8000_192000, SKL_FORMATS),
342-
.capture = SOF_DAI_STREAM("Analog CPU Capture", 1, 16,
343-
SNDRV_PCM_RATE_8000_192000, SKL_FORMATS),
344303
},
345304
{
346305
.name = "Digital CPU DAI",
347306
.ops = &hda_link_dai_ops,
348-
.playback = SOF_DAI_STREAM("Digital CPU Playback", 1, 16,
349-
SNDRV_PCM_RATE_8000_192000, SKL_FORMATS),
350-
.capture = SOF_DAI_STREAM("Digital CPU Capture", 1, 16,
351-
SNDRV_PCM_RATE_8000_192000, SKL_FORMATS),
352307
},
353308
{
354309
.name = "Alt Analog CPU DAI",
355310
.ops = &hda_link_dai_ops,
356-
.playback = SOF_DAI_STREAM("Alt Analog CPU Playback", 1, 16,
357-
SNDRV_PCM_RATE_8000_192000, SKL_FORMATS),
358-
.capture = SOF_DAI_STREAM("Alt Analog CPU Capture", 1, 16,
359-
SNDRV_PCM_RATE_8000_192000, SKL_FORMATS),
360311
},
361312
#endif
362313
};

‎sound/soc/sof/intel/hsw.c‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -640,24 +640,13 @@ static int hsw_probe(struct snd_sof_dev *sdev)
640640
return ret;
641641
}
642642

643-
#define HSW_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE | \
644-
SNDRV_PCM_FMTBIT_S32_LE)
645-
646643
/* Haswell DAIs */
647644
static struct snd_soc_dai_driver hsw_dai[] = {
648645
{
649646
.name = "ssp0-port",
650-
.playback = SOF_DAI_STREAM("ssp0 Tx", 1, 8,
651-
SNDRV_PCM_RATE_8000_192000, HSW_FORMATS),
652-
.capture = SOF_DAI_STREAM("ssp0 Rx", 1, 8,
653-
SNDRV_PCM_RATE_8000_192000, HSW_FORMATS),
654647
},
655648
{
656649
.name = "ssp1-port",
657-
.playback = SOF_DAI_STREAM("ssp1 Tx", 1, 8,
658-
SNDRV_PCM_RATE_8000_192000, HSW_FORMATS),
659-
.capture = SOF_DAI_STREAM("ssp1 Rx", 1, 8,
660-
SNDRV_PCM_RATE_8000_192000, HSW_FORMATS),
661650
},
662651
};
663652

0 commit comments

Comments
 (0)