Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ASoC: use inclusive language for
Merge series from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:
We have both
(A) SND_SOC_DAIFMT_CB{M/S}_CF{M/S} : Master/Slave.
(B) SND_SOC_DAIFMT_CB{P/C}_CF{P/S} : Provider/Consumer
We should use (B), and want to remove (A). This patch-set do it.
+347
-353
+2
-2
Documentation/sound/soc/codec-to-codec.rst
+2
-2
Documentation/sound/soc/codec-to-codec.rst
···
68
68
.codec_dai_name = "codec-2-dai_name",
69
69
.platform_name = "samsung-i2s.0",
70
70
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
71
-
| SND_SOC_DAIFMT_CBM_CFM,
71
+
| SND_SOC_DAIFMT_CBP_CFP,
72
72
.ignore_suspend = 1,
73
73
.c2c_params = &dsp_codec_params,
74
74
.num_c2c_params = 1,
···
80
80
.codec_name = "codec-3,
81
81
.codec_dai_name = "codec-3-dai_name",
82
82
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
83
-
| SND_SOC_DAIFMT_CBM_CFM,
83
+
| SND_SOC_DAIFMT_CBP_CFP,
84
84
.ignore_suspend = 1,
85
85
.c2c_params = &dsp_codec_params,
86
86
.num_c2c_params = 1,
-6
include/sound/soc-dai.h
-6
include/sound/soc-dai.h
···
118
118
#define SND_SOC_DAIFMT_CBP_CFC (3 << 12) /* codec clk provider & frame consumer */
119
119
#define SND_SOC_DAIFMT_CBC_CFC (4 << 12) /* codec clk consumer & frame consumer */
120
120
121
-
/* previous definitions kept for backwards-compatibility, do not use in new contributions */
122
-
#define SND_SOC_DAIFMT_CBM_CFM SND_SOC_DAIFMT_CBP_CFP
123
-
#define SND_SOC_DAIFMT_CBS_CFM SND_SOC_DAIFMT_CBC_CFP
124
-
#define SND_SOC_DAIFMT_CBM_CFS SND_SOC_DAIFMT_CBP_CFC
125
-
#define SND_SOC_DAIFMT_CBS_CFS SND_SOC_DAIFMT_CBC_CFC
126
-
127
121
/* when passed to set_fmt directly indicate if the device is provider or consumer */
128
122
#define SND_SOC_DAIFMT_BP_FP SND_SOC_DAIFMT_CBP_CFP
129
123
#define SND_SOC_DAIFMT_BC_FP SND_SOC_DAIFMT_CBC_CFP
+1
-1
sound/soc/amd/acp/acp-mach-common.c
+1
-1
sound/soc/amd/acp/acp-mach-common.c
+6
-6
sound/soc/codecs/arizona.c
+6
-6
sound/soc/codecs/arizona.c
···
1457
1457
break;
1458
1458
case SND_SOC_DAIFMT_DSP_B:
1459
1459
if ((fmt & SND_SOC_DAIFMT_MASTER_MASK)
1460
-
!= SND_SOC_DAIFMT_CBM_CFM) {
1460
+
!= SND_SOC_DAIFMT_CBP_CFP) {
1461
1461
arizona_aif_err(dai, "DSP_B not valid in slave mode\n");
1462
1462
return -EINVAL;
1463
1463
}
···
1468
1468
break;
1469
1469
case SND_SOC_DAIFMT_LEFT_J:
1470
1470
if ((fmt & SND_SOC_DAIFMT_MASTER_MASK)
1471
-
!= SND_SOC_DAIFMT_CBM_CFM) {
1471
+
!= SND_SOC_DAIFMT_CBP_CFP) {
1472
1472
arizona_aif_err(dai, "LEFT_J not valid in slave mode\n");
1473
1473
return -EINVAL;
1474
1474
}
···
1481
1481
}
1482
1482
1483
1483
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
1484
-
case SND_SOC_DAIFMT_CBS_CFS:
1484
+
case SND_SOC_DAIFMT_CBC_CFC:
1485
1485
break;
1486
-
case SND_SOC_DAIFMT_CBS_CFM:
1486
+
case SND_SOC_DAIFMT_CBC_CFP:
1487
1487
lrclk |= ARIZONA_AIF1TX_LRCLK_MSTR;
1488
1488
break;
1489
-
case SND_SOC_DAIFMT_CBM_CFS:
1489
+
case SND_SOC_DAIFMT_CBP_CFC:
1490
1490
bclk |= ARIZONA_AIF1_BCLK_MSTR;
1491
1491
break;
1492
-
case SND_SOC_DAIFMT_CBM_CFM:
1492
+
case SND_SOC_DAIFMT_CBP_CFP:
1493
1493
bclk |= ARIZONA_AIF1_BCLK_MSTR;
1494
1494
lrclk |= ARIZONA_AIF1TX_LRCLK_MSTR;
1495
1495
break;
+2
-2
sound/soc/codecs/cs35l32.c
+2
-2
sound/soc/codecs/cs35l32.c
···
153
153
struct snd_soc_component *component = codec_dai->component;
154
154
155
155
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
156
-
case SND_SOC_DAIFMT_CBM_CFM:
156
+
case SND_SOC_DAIFMT_CBP_CFP:
157
157
snd_soc_component_update_bits(component, CS35L32_ADSP_CTL,
158
158
CS35L32_ADSP_MASTER_MASK,
159
159
CS35L32_ADSP_MASTER_MASK);
160
160
break;
161
-
case SND_SOC_DAIFMT_CBS_CFS:
161
+
case SND_SOC_DAIFMT_CBC_CFC:
162
162
snd_soc_component_update_bits(component, CS35L32_ADSP_CTL,
163
163
CS35L32_ADSP_MASTER_MASK, 0);
164
164
break;
+2
-2
sound/soc/codecs/cs35l33.c
+2
-2
sound/soc/codecs/cs35l33.c
···
438
438
struct cs35l33_private *priv = snd_soc_component_get_drvdata(component);
439
439
440
440
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
441
-
case SND_SOC_DAIFMT_CBM_CFM:
441
+
case SND_SOC_DAIFMT_CBP_CFP:
442
442
regmap_update_bits(priv->regmap, CS35L33_ADSP_CTL,
443
443
CS35L33_MS_MASK, CS35L33_MS_MASK);
444
444
dev_dbg(component->dev, "Audio port in master mode\n");
445
445
break;
446
-
case SND_SOC_DAIFMT_CBS_CFS:
446
+
case SND_SOC_DAIFMT_CBC_CFC:
447
447
regmap_update_bits(priv->regmap, CS35L33_ADSP_CTL,
448
448
CS35L33_MS_MASK, 0);
449
449
dev_dbg(component->dev, "Audio port in slave mode\n");
+2
-2
sound/soc/codecs/cs35l34.c
+2
-2
sound/soc/codecs/cs35l34.c
···
523
523
struct cs35l34_private *priv = snd_soc_component_get_drvdata(component);
524
524
525
525
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
526
-
case SND_SOC_DAIFMT_CBM_CFM:
526
+
case SND_SOC_DAIFMT_CBP_CFP:
527
527
regmap_update_bits(priv->regmap, CS35L34_ADSP_CLK_CTL,
528
528
0x80, 0x80);
529
529
break;
530
-
case SND_SOC_DAIFMT_CBS_CFS:
530
+
case SND_SOC_DAIFMT_CBC_CFC:
531
531
regmap_update_bits(priv->regmap, CS35L34_ADSP_CLK_CTL,
532
532
0x80, 0x00);
533
533
break;
+2
-2
sound/soc/codecs/cs4234.c
+2
-2
sound/soc/codecs/cs4234.c
···
307
307
}
308
308
309
309
switch (format & SND_SOC_DAIFMT_MASTER_MASK) {
310
-
case SND_SOC_DAIFMT_CBS_CFS:
310
+
case SND_SOC_DAIFMT_CBC_CFC:
311
311
break;
312
-
case SND_SOC_DAIFMT_CBM_CFM:
312
+
case SND_SOC_DAIFMT_CBP_CFP:
313
313
if (cs4234->format == SND_SOC_DAIFMT_DSP_A) {
314
314
dev_err(component->dev, "Unsupported DSP A format in master mode\n");
315
315
return -EINVAL;
+2
-2
sound/soc/codecs/cs4265.c
+2
-2
sound/soc/codecs/cs4265.c
···
344
344
u8 iface = 0;
345
345
346
346
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
347
-
case SND_SOC_DAIFMT_CBM_CFM:
347
+
case SND_SOC_DAIFMT_CBP_CFP:
348
348
snd_soc_component_update_bits(component, CS4265_ADC_CTL,
349
349
CS4265_ADC_MASTER,
350
350
CS4265_ADC_MASTER);
351
351
break;
352
-
case SND_SOC_DAIFMT_CBS_CFS:
352
+
case SND_SOC_DAIFMT_CBC_CFC:
353
353
snd_soc_component_update_bits(component, CS4265_ADC_CTL,
354
354
CS4265_ADC_MASTER,
355
355
0);
+2
-2
sound/soc/codecs/cs4270.c
+2
-2
sound/soc/codecs/cs4270.c
···
287
287
288
288
/* set master/slave audio interface */
289
289
switch (format & SND_SOC_DAIFMT_MASTER_MASK) {
290
-
case SND_SOC_DAIFMT_CBS_CFS:
290
+
case SND_SOC_DAIFMT_CBC_CFC:
291
291
cs4270->slave_mode = 1;
292
292
break;
293
-
case SND_SOC_DAIFMT_CBM_CFM:
293
+
case SND_SOC_DAIFMT_CBP_CFP:
294
294
cs4270->slave_mode = 0;
295
295
break;
296
296
default:
+2
-2
sound/soc/codecs/cs4271.c
+2
-2
sound/soc/codecs/cs4271.c
···
209
209
int ret;
210
210
211
211
switch (format & SND_SOC_DAIFMT_MASTER_MASK) {
212
-
case SND_SOC_DAIFMT_CBS_CFS:
212
+
case SND_SOC_DAIFMT_CBC_CFC:
213
213
cs4271->master = false;
214
214
break;
215
-
case SND_SOC_DAIFMT_CBM_CFM:
215
+
case SND_SOC_DAIFMT_CBP_CFP:
216
216
cs4271->master = true;
217
217
val |= CS4271_MODE1_MASTER;
218
218
break;
+2
-2
sound/soc/codecs/cs42l42.c
+2
-2
sound/soc/codecs/cs42l42.c
···
830
830
u32 asp_cfg_val = 0;
831
831
832
832
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
833
-
case SND_SOC_DAIFMT_CBS_CFM:
833
+
case SND_SOC_DAIFMT_CBC_CFP:
834
834
asp_cfg_val |= CS42L42_ASP_MASTER_MODE <<
835
835
CS42L42_ASP_MODE_SHIFT;
836
836
break;
837
-
case SND_SOC_DAIFMT_CBS_CFS:
837
+
case SND_SOC_DAIFMT_CBC_CFC:
838
838
asp_cfg_val |= CS42L42_ASP_SLAVE_MODE <<
839
839
CS42L42_ASP_MODE_SHIFT;
840
840
break;
+2
-2
sound/soc/codecs/cs42l51.c
+2
-2
sound/soc/codecs/cs42l51.c
···
322
322
}
323
323
324
324
switch (format & SND_SOC_DAIFMT_MASTER_MASK) {
325
-
case SND_SOC_DAIFMT_CBM_CFM:
325
+
case SND_SOC_DAIFMT_CBP_CFP:
326
326
cs42l51->func = MODE_MASTER;
327
327
break;
328
-
case SND_SOC_DAIFMT_CBS_CFS:
328
+
case SND_SOC_DAIFMT_CBC_CFC:
329
329
cs42l51->func = MODE_SLAVE_AUTO;
330
330
break;
331
331
default:
+2
-2
sound/soc/codecs/cs42l52.c
+2
-2
sound/soc/codecs/cs42l52.c
···
733
733
u8 iface = 0;
734
734
735
735
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
736
-
case SND_SOC_DAIFMT_CBM_CFM:
736
+
case SND_SOC_DAIFMT_CBP_CFP:
737
737
iface = CS42L52_IFACE_CTL1_MASTER;
738
738
break;
739
-
case SND_SOC_DAIFMT_CBS_CFS:
739
+
case SND_SOC_DAIFMT_CBC_CFC:
740
740
iface = CS42L52_IFACE_CTL1_SLAVE;
741
741
break;
742
742
default:
+2
-2
sound/soc/codecs/cs42l56.c
+2
-2
sound/soc/codecs/cs42l56.c
···
757
757
struct cs42l56_private *cs42l56 = snd_soc_component_get_drvdata(component);
758
758
759
759
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
760
-
case SND_SOC_DAIFMT_CBM_CFM:
760
+
case SND_SOC_DAIFMT_CBP_CFP:
761
761
cs42l56->iface = CS42L56_MASTER_MODE;
762
762
break;
763
-
case SND_SOC_DAIFMT_CBS_CFS:
763
+
case SND_SOC_DAIFMT_CBC_CFC:
764
764
cs42l56->iface = CS42L56_SLAVE_MODE;
765
765
break;
766
766
default:
+2
-2
sound/soc/codecs/cs42l73.c
+2
-2
sound/soc/codecs/cs42l73.c
···
943
943
mmcc = snd_soc_component_read(component, CS42L73_MMCC(id));
944
944
945
945
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
946
-
case SND_SOC_DAIFMT_CBM_CFM:
946
+
case SND_SOC_DAIFMT_CBP_CFP:
947
947
mmcc |= CS42L73_MS_MASTER;
948
948
break;
949
949
950
-
case SND_SOC_DAIFMT_CBS_CFS:
950
+
case SND_SOC_DAIFMT_CBC_CFC:
951
951
mmcc &= ~CS42L73_MS_MASTER;
952
952
break;
953
953
+2
-2
sound/soc/codecs/cs42xx8.c
+2
-2
sound/soc/codecs/cs42xx8.c
···
242
242
243
243
/* Set master/slave audio interface */
244
244
switch (format & SND_SOC_DAIFMT_MASTER_MASK) {
245
-
case SND_SOC_DAIFMT_CBS_CFS:
245
+
case SND_SOC_DAIFMT_CBC_CFC:
246
246
cs42xx8->slave_mode = true;
247
247
break;
248
-
case SND_SOC_DAIFMT_CBM_CFM:
248
+
case SND_SOC_DAIFMT_CBP_CFP:
249
249
cs42xx8->slave_mode = false;
250
250
break;
251
251
default:
+12
-12
sound/soc/codecs/cs43130.c
+12
-12
sound/soc/codecs/cs43130.c
···
640
640
}
641
641
642
642
switch (cs43130->dais[dai_id].dai_mode) {
643
-
case SND_SOC_DAIFMT_CBS_CFS:
643
+
case SND_SOC_DAIFMT_CBC_CFC:
644
644
dai_mode_val = 0;
645
645
break;
646
-
case SND_SOC_DAIFMT_CBM_CFM:
646
+
case SND_SOC_DAIFMT_CBP_CFP:
647
647
dai_mode_val = 1;
648
648
break;
649
649
default:
···
851
851
return -EINVAL;
852
852
}
853
853
854
-
if (cs43130->dais[dai->id].dai_mode == SND_SOC_DAIFMT_CBM_CFM)
854
+
if (cs43130->dais[dai->id].dai_mode == SND_SOC_DAIFMT_CBP_CFP)
855
855
regmap_update_bits(cs43130->regmap, CS43130_DSD_INT_CFG,
856
856
CS43130_DSD_MASTER, CS43130_DSD_MASTER);
857
857
else
···
951
951
break;
952
952
}
953
953
954
-
if (!sclk && cs43130->dais[dai->id].dai_mode == SND_SOC_DAIFMT_CBM_CFM)
954
+
if (!sclk && cs43130->dais[dai->id].dai_mode == SND_SOC_DAIFMT_CBP_CFP)
955
955
/* Calculate SCLK in master mode if unassigned */
956
956
sclk = params_rate(params) * bitwidth_dai *
957
957
params_channels(params);
···
1516
1516
struct cs43130_private *cs43130 = snd_soc_component_get_drvdata(component);
1517
1517
1518
1518
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
1519
-
case SND_SOC_DAIFMT_CBS_CFS:
1520
-
cs43130->dais[codec_dai->id].dai_mode = SND_SOC_DAIFMT_CBS_CFS;
1519
+
case SND_SOC_DAIFMT_CBC_CFC:
1520
+
cs43130->dais[codec_dai->id].dai_mode = SND_SOC_DAIFMT_CBC_CFC;
1521
1521
break;
1522
-
case SND_SOC_DAIFMT_CBM_CFM:
1523
-
cs43130->dais[codec_dai->id].dai_mode = SND_SOC_DAIFMT_CBM_CFM;
1522
+
case SND_SOC_DAIFMT_CBP_CFP:
1523
+
cs43130->dais[codec_dai->id].dai_mode = SND_SOC_DAIFMT_CBP_CFP;
1524
1524
break;
1525
1525
default:
1526
1526
dev_err(cs43130->dev, "unsupported mode\n");
···
1579
1579
struct cs43130_private *cs43130 = snd_soc_component_get_drvdata(component);
1580
1580
1581
1581
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
1582
-
case SND_SOC_DAIFMT_CBS_CFS:
1583
-
cs43130->dais[codec_dai->id].dai_mode = SND_SOC_DAIFMT_CBS_CFS;
1582
+
case SND_SOC_DAIFMT_CBC_CFC:
1583
+
cs43130->dais[codec_dai->id].dai_mode = SND_SOC_DAIFMT_CBC_CFC;
1584
1584
break;
1585
-
case SND_SOC_DAIFMT_CBM_CFM:
1586
-
cs43130->dais[codec_dai->id].dai_mode = SND_SOC_DAIFMT_CBM_CFM;
1585
+
case SND_SOC_DAIFMT_CBP_CFP:
1586
+
cs43130->dais[codec_dai->id].dai_mode = SND_SOC_DAIFMT_CBP_CFP;
1587
1587
break;
1588
1588
default:
1589
1589
dev_err(cs43130->dev, "Unsupported DAI format.\n");
+1
-1
sound/soc/codecs/cs4341.c
+1
-1
sound/soc/codecs/cs4341.c
+2
-2
sound/soc/codecs/cs530x.c
+2
-2
sound/soc/codecs/cs530x.c
···
557
557
unsigned int asp_fmt, asp_cfg = 0;
558
558
559
559
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
560
-
case SND_SOC_DAIFMT_CBS_CFS:
560
+
case SND_SOC_DAIFMT_CBC_CFC:
561
561
break;
562
-
case SND_SOC_DAIFMT_CBM_CFM:
562
+
case SND_SOC_DAIFMT_CBP_CFP:
563
563
asp_cfg = CS530X_ASP_PRIMARY;
564
564
break;
565
565
default:
+2
-2
sound/soc/codecs/cs53l30.c
+2
-2
sound/soc/codecs/cs53l30.c
···
572
572
u8 aspcfg = 0, aspctl1 = 0;
573
573
574
574
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
575
-
case SND_SOC_DAIFMT_CBM_CFM:
575
+
case SND_SOC_DAIFMT_CBP_CFP:
576
576
aspcfg |= CS53L30_ASP_MS;
577
577
break;
578
-
case SND_SOC_DAIFMT_CBS_CFS:
578
+
case SND_SOC_DAIFMT_CBC_CFC:
579
579
break;
580
580
default:
581
581
return -EINVAL;
+2
-2
sound/soc/codecs/da7210.c
+2
-2
sound/soc/codecs/da7210.c
···
882
882
return -EINVAL;
883
883
884
884
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
885
-
case SND_SOC_DAIFMT_CBM_CFM:
885
+
case SND_SOC_DAIFMT_CBP_CFP:
886
886
da7210->master = 1;
887
887
dai_cfg1 |= DA7210_DAI_MODE_MASTER;
888
888
break;
889
-
case SND_SOC_DAIFMT_CBS_CFS:
889
+
case SND_SOC_DAIFMT_CBC_CFC:
890
890
da7210->master = 0;
891
891
dai_cfg1 |= DA7210_DAI_MODE_SLAVE;
892
892
break;
+2
-2
sound/soc/codecs/da7218.c
+2
-2
sound/soc/codecs/da7218.c
···
1935
1935
u8 dai_clk_mode = 0, dai_ctrl = 0;
1936
1936
1937
1937
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
1938
-
case SND_SOC_DAIFMT_CBM_CFM:
1938
+
case SND_SOC_DAIFMT_CBP_CFP:
1939
1939
da7218->master = true;
1940
1940
break;
1941
-
case SND_SOC_DAIFMT_CBS_CFS:
1941
+
case SND_SOC_DAIFMT_CBC_CFC:
1942
1942
da7218->master = false;
1943
1943
break;
1944
1944
default:
+2
-2
sound/soc/codecs/da7219.c
+2
-2
sound/soc/codecs/da7219.c
···
1312
1312
u8 dai_clk_mode = 0, dai_ctrl = 0;
1313
1313
1314
1314
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
1315
-
case SND_SOC_DAIFMT_CBM_CFM:
1315
+
case SND_SOC_DAIFMT_CBP_CFP:
1316
1316
da7219->master = true;
1317
1317
break;
1318
-
case SND_SOC_DAIFMT_CBS_CFS:
1318
+
case SND_SOC_DAIFMT_CBC_CFC:
1319
1319
da7219->master = false;
1320
1320
break;
1321
1321
default:
+2
-2
sound/soc/codecs/da732x.c
+2
-2
sound/soc/codecs/da732x.c
···
1034
1034
}
1035
1035
1036
1036
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
1037
-
case SND_SOC_DAIFMT_CBS_CFS:
1037
+
case SND_SOC_DAIFMT_CBC_CFC:
1038
1038
aif1 = DA732X_AIF_SLAVE;
1039
1039
aif_mclk = DA732X_AIFM_FRAME_64 | DA732X_AIFM_SRC_SEL_AIFA;
1040
1040
break;
1041
-
case SND_SOC_DAIFMT_CBM_CFM:
1041
+
case SND_SOC_DAIFMT_CBP_CFP:
1042
1042
aif1 = DA732X_AIF_CLK_FROM_SRC;
1043
1043
aif_mclk = DA732X_CLK_GENERATION_AIF_A;
1044
1044
break;
+2
-2
sound/soc/codecs/da9055.c
+2
-2
sound/soc/codecs/da9055.c
···
1160
1160
u8 aif_clk_mode, aif_ctrl, mode;
1161
1161
1162
1162
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
1163
-
case SND_SOC_DAIFMT_CBM_CFM:
1163
+
case SND_SOC_DAIFMT_CBP_CFP:
1164
1164
/* DA9055 in I2S Master Mode */
1165
1165
mode = 1;
1166
1166
aif_clk_mode = DA9055_AIF_CLK_EN_MASTER_MODE;
1167
1167
break;
1168
-
case SND_SOC_DAIFMT_CBS_CFS:
1168
+
case SND_SOC_DAIFMT_CBC_CFC:
1169
1169
/* DA9055 in I2S Slave Mode */
1170
1170
mode = 0;
1171
1171
aif_clk_mode = DA9055_AIF_CLK_EN_SLAVE_MODE;
+2
-2
sound/soc/codecs/lochnagar-sc.c
+2
-2
sound/soc/codecs/lochnagar-sc.c
···
129
129
130
130
static int lochnagar_sc_set_line_fmt(struct snd_soc_dai *dai, unsigned int fmt)
131
131
{
132
-
return lochnagar_sc_check_fmt(dai, fmt, SND_SOC_DAIFMT_CBS_CFS);
132
+
return lochnagar_sc_check_fmt(dai, fmt, SND_SOC_DAIFMT_CBC_CFC);
133
133
}
134
134
135
135
static int lochnagar_sc_set_usb_fmt(struct snd_soc_dai *dai, unsigned int fmt)
136
136
{
137
-
return lochnagar_sc_check_fmt(dai, fmt, SND_SOC_DAIFMT_CBM_CFM);
137
+
return lochnagar_sc_check_fmt(dai, fmt, SND_SOC_DAIFMT_CBP_CFP);
138
138
}
139
139
140
140
static const struct snd_soc_dai_ops lochnagar_sc_line_ops = {
+6
-6
sound/soc/codecs/madera.c
+6
-6
sound/soc/codecs/madera.c
···
2776
2776
break;
2777
2777
case SND_SOC_DAIFMT_DSP_B:
2778
2778
if ((fmt & SND_SOC_DAIFMT_MASTER_MASK) !=
2779
-
SND_SOC_DAIFMT_CBM_CFM) {
2779
+
SND_SOC_DAIFMT_CBP_CFP) {
2780
2780
madera_aif_err(dai, "DSP_B not valid in slave mode\n");
2781
2781
return -EINVAL;
2782
2782
}
···
2787
2787
break;
2788
2788
case SND_SOC_DAIFMT_LEFT_J:
2789
2789
if ((fmt & SND_SOC_DAIFMT_MASTER_MASK) !=
2790
-
SND_SOC_DAIFMT_CBM_CFM) {
2790
+
SND_SOC_DAIFMT_CBP_CFP) {
2791
2791
madera_aif_err(dai, "LEFT_J not valid in slave mode\n");
2792
2792
return -EINVAL;
2793
2793
}
···
2800
2800
}
2801
2801
2802
2802
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
2803
-
case SND_SOC_DAIFMT_CBS_CFS:
2803
+
case SND_SOC_DAIFMT_CBC_CFC:
2804
2804
break;
2805
-
case SND_SOC_DAIFMT_CBS_CFM:
2805
+
case SND_SOC_DAIFMT_CBC_CFP:
2806
2806
lrclk |= MADERA_AIF1TX_LRCLK_MSTR;
2807
2807
break;
2808
-
case SND_SOC_DAIFMT_CBM_CFS:
2808
+
case SND_SOC_DAIFMT_CBP_CFC:
2809
2809
bclk |= MADERA_AIF1_BCLK_MSTR;
2810
2810
break;
2811
-
case SND_SOC_DAIFMT_CBM_CFM:
2811
+
case SND_SOC_DAIFMT_CBP_CFP:
2812
2812
bclk |= MADERA_AIF1_BCLK_MSTR;
2813
2813
lrclk |= MADERA_AIF1TX_LRCLK_MSTR;
2814
2814
break;
+2
-2
sound/soc/codecs/nau8540.c
+2
-2
sound/soc/codecs/nau8540.c
···
482
482
unsigned int ctrl1_val = 0, ctrl2_val = 0;
483
483
484
484
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
485
-
case SND_SOC_DAIFMT_CBM_CFM:
485
+
case SND_SOC_DAIFMT_CBP_CFP:
486
486
ctrl2_val |= NAU8540_I2S_MS_MASTER;
487
487
break;
488
-
case SND_SOC_DAIFMT_CBS_CFS:
488
+
case SND_SOC_DAIFMT_CBC_CFC:
489
489
break;
490
490
default:
491
491
return -EINVAL;
+2
-2
sound/soc/codecs/nau8810.c
+2
-2
sound/soc/codecs/nau8810.c
···
613
613
u16 ctrl1_val = 0, ctrl2_val = 0;
614
614
615
615
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
616
-
case SND_SOC_DAIFMT_CBM_CFM:
616
+
case SND_SOC_DAIFMT_CBP_CFP:
617
617
ctrl2_val |= NAU8810_CLKIO_MASTER;
618
618
break;
619
-
case SND_SOC_DAIFMT_CBS_CFS:
619
+
case SND_SOC_DAIFMT_CBC_CFC:
620
620
break;
621
621
default:
622
622
return -EINVAL;
+2
-2
sound/soc/codecs/nau8822.c
+2
-2
sound/soc/codecs/nau8822.c
···
806
806
dev_dbg(component->dev, "%s\n", __func__);
807
807
808
808
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
809
-
case SND_SOC_DAIFMT_CBM_CFM:
809
+
case SND_SOC_DAIFMT_CBP_CFP:
810
810
ctrl2_val |= 1;
811
811
break;
812
-
case SND_SOC_DAIFMT_CBS_CFS:
812
+
case SND_SOC_DAIFMT_CBC_CFC:
813
813
ctrl2_val &= ~1;
814
814
break;
815
815
default:
+2
-2
sound/soc/codecs/nau8824.c
+2
-2
sound/soc/codecs/nau8824.c
···
1159
1159
unsigned int ctrl1_val = 0, ctrl2_val = 0;
1160
1160
1161
1161
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
1162
-
case SND_SOC_DAIFMT_CBM_CFM:
1162
+
case SND_SOC_DAIFMT_CBP_CFP:
1163
1163
ctrl2_val |= NAU8824_I2S_MS_MASTER;
1164
1164
break;
1165
-
case SND_SOC_DAIFMT_CBS_CFS:
1165
+
case SND_SOC_DAIFMT_CBC_CFC:
1166
1166
break;
1167
1167
default:
1168
1168
return -EINVAL;
+2
-2
sound/soc/codecs/nau8825.c
+2
-2
sound/soc/codecs/nau8825.c
···
1356
1356
unsigned int ctrl1_val = 0, ctrl2_val = 0;
1357
1357
1358
1358
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
1359
-
case SND_SOC_DAIFMT_CBM_CFM:
1359
+
case SND_SOC_DAIFMT_CBP_CFP:
1360
1360
ctrl2_val |= NAU8825_I2S_MS_MASTER;
1361
1361
break;
1362
-
case SND_SOC_DAIFMT_CBS_CFS:
1362
+
case SND_SOC_DAIFMT_CBC_CFC:
1363
1363
break;
1364
1364
default:
1365
1365
return -EINVAL;
+2
-2
sound/soc/codecs/rk817_codec.c
+2
-2
sound/soc/codecs/rk817_codec.c
···
303
303
unsigned int i2s_mst = 0;
304
304
305
305
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
306
-
case SND_SOC_DAIFMT_CBS_CFS:
306
+
case SND_SOC_DAIFMT_CBC_CFC:
307
307
i2s_mst |= RK817_I2S_MODE_SLV;
308
308
break;
309
-
case SND_SOC_DAIFMT_CBM_CFM:
309
+
case SND_SOC_DAIFMT_CBP_CFP:
310
310
i2s_mst |= RK817_I2S_MODE_MST;
311
311
break;
312
312
default:
+1
-1
sound/soc/codecs/rt1011.c
+1
-1
sound/soc/codecs/rt1011.c
+2
-2
sound/soc/codecs/rt1015.c
+2
-2
sound/soc/codecs/rt1015.c
···
753
753
unsigned int reg_val = 0, reg_val2 = 0;
754
754
755
755
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
756
-
case SND_SOC_DAIFMT_CBM_CFM:
756
+
case SND_SOC_DAIFMT_CBP_CFP:
757
757
reg_val |= RT1015_TCON_TDM_MS_M;
758
758
break;
759
-
case SND_SOC_DAIFMT_CBS_CFS:
759
+
case SND_SOC_DAIFMT_CBC_CFC:
760
760
reg_val |= RT1015_TCON_TDM_MS_S;
761
761
break;
762
762
default:
+2
-2
sound/soc/codecs/rt1016.c
+2
-2
sound/soc/codecs/rt1016.c
···
367
367
unsigned int reg_val = 0;
368
368
369
369
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
370
-
case SND_SOC_DAIFMT_CBM_CFM:
370
+
case SND_SOC_DAIFMT_CBP_CFP:
371
371
reg_val |= RT1016_I2S_MS_M;
372
372
rt1016->master = 1;
373
373
break;
374
-
case SND_SOC_DAIFMT_CBS_CFS:
374
+
case SND_SOC_DAIFMT_CBC_CFC:
375
375
reg_val |= RT1016_I2S_MS_S;
376
376
break;
377
377
default:
+2
-2
sound/soc/codecs/rt1305.c
+2
-2
sound/soc/codecs/rt1305.c
···
697
697
unsigned int reg_val = 0, reg1_val = 0;
698
698
699
699
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
700
-
case SND_SOC_DAIFMT_CBM_CFM:
700
+
case SND_SOC_DAIFMT_CBP_CFP:
701
701
reg_val |= RT1305_SEL_I2S_OUT_MODE_M;
702
702
rt1305->master = 1;
703
703
break;
704
-
case SND_SOC_DAIFMT_CBS_CFS:
704
+
case SND_SOC_DAIFMT_CBC_CFC:
705
705
reg_val |= RT1305_SEL_I2S_OUT_MODE_S;
706
706
rt1305->master = 0;
707
707
break;
+1
-1
sound/soc/codecs/rt1308.c
+1
-1
sound/soc/codecs/rt1308.c
+2
-2
sound/soc/codecs/rt274.c
+2
-2
sound/soc/codecs/rt274.c
···
706
706
struct rt274_priv *rt274 = snd_soc_component_get_drvdata(component);
707
707
708
708
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
709
-
case SND_SOC_DAIFMT_CBM_CFM:
709
+
case SND_SOC_DAIFMT_CBP_CFP:
710
710
snd_soc_component_update_bits(component,
711
711
RT274_I2S_CTRL1, RT274_I2S_MODE_MASK, RT274_I2S_MODE_M);
712
712
rt274->master = true;
713
713
break;
714
-
case SND_SOC_DAIFMT_CBS_CFS:
714
+
case SND_SOC_DAIFMT_CBC_CFC:
715
715
snd_soc_component_update_bits(component,
716
716
RT274_I2S_CTRL1, RT274_I2S_MODE_MASK, RT274_I2S_MODE_S);
717
717
rt274->master = false;
+2
-2
sound/soc/codecs/rt286.c
+2
-2
sound/soc/codecs/rt286.c
···
765
765
struct snd_soc_component *component = dai->component;
766
766
767
767
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
768
-
case SND_SOC_DAIFMT_CBM_CFM:
768
+
case SND_SOC_DAIFMT_CBP_CFP:
769
769
snd_soc_component_update_bits(component,
770
770
RT286_I2S_CTRL1, 0x800, 0x800);
771
771
break;
772
-
case SND_SOC_DAIFMT_CBS_CFS:
772
+
case SND_SOC_DAIFMT_CBC_CFC:
773
773
snd_soc_component_update_bits(component,
774
774
RT286_I2S_CTRL1, 0x800, 0x0);
775
775
break;
+2
-2
sound/soc/codecs/rt298.c
+2
-2
sound/soc/codecs/rt298.c
···
829
829
struct snd_soc_component *component = dai->component;
830
830
831
831
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
832
-
case SND_SOC_DAIFMT_CBM_CFM:
832
+
case SND_SOC_DAIFMT_CBP_CFP:
833
833
snd_soc_component_update_bits(component,
834
834
RT298_I2S_CTRL1, 0x800, 0x800);
835
835
break;
836
-
case SND_SOC_DAIFMT_CBS_CFS:
836
+
case SND_SOC_DAIFMT_CBC_CFC:
837
837
snd_soc_component_update_bits(component,
838
838
RT298_I2S_CTRL1, 0x800, 0x0);
839
839
break;
+2
-2
sound/soc/codecs/rt5616.c
+2
-2
sound/soc/codecs/rt5616.c
···
1015
1015
unsigned int reg_val = 0;
1016
1016
1017
1017
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
1018
-
case SND_SOC_DAIFMT_CBM_CFM:
1018
+
case SND_SOC_DAIFMT_CBP_CFP:
1019
1019
rt5616->master[dai->id] = 1;
1020
1020
break;
1021
-
case SND_SOC_DAIFMT_CBS_CFS:
1021
+
case SND_SOC_DAIFMT_CBC_CFC:
1022
1022
reg_val |= RT5616_I2S_MS_S;
1023
1023
rt5616->master[dai->id] = 0;
1024
1024
break;
+2
-2
sound/soc/codecs/rt5631.c
+2
-2
sound/soc/codecs/rt5631.c
···
1411
1411
dev_dbg(component->dev, "enter %s\n", __func__);
1412
1412
1413
1413
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
1414
-
case SND_SOC_DAIFMT_CBM_CFM:
1414
+
case SND_SOC_DAIFMT_CBP_CFP:
1415
1415
rt5631->master = 1;
1416
1416
break;
1417
-
case SND_SOC_DAIFMT_CBS_CFS:
1417
+
case SND_SOC_DAIFMT_CBC_CFC:
1418
1418
iface |= RT5631_SDP_MODE_SEL_SLAVE;
1419
1419
rt5631->master = 0;
1420
1420
break;
+2
-2
sound/soc/codecs/rt5640.c
+2
-2
sound/soc/codecs/rt5640.c
···
1773
1773
int dai_sel;
1774
1774
1775
1775
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
1776
-
case SND_SOC_DAIFMT_CBM_CFM:
1776
+
case SND_SOC_DAIFMT_CBP_CFP:
1777
1777
rt5640->master[dai->id] = 1;
1778
1778
break;
1779
-
case SND_SOC_DAIFMT_CBS_CFS:
1779
+
case SND_SOC_DAIFMT_CBC_CFC:
1780
1780
reg_val |= RT5640_I2S_MS_S;
1781
1781
rt5640->master[dai->id] = 0;
1782
1782
break;
+2
-2
sound/soc/codecs/rt5645.c
+2
-2
sound/soc/codecs/rt5645.c
···
2841
2841
}
2842
2842
2843
2843
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
2844
-
case SND_SOC_DAIFMT_CBM_CFM:
2844
+
case SND_SOC_DAIFMT_CBP_CFP:
2845
2845
rt5645->master[dai->id] = 1;
2846
2846
break;
2847
-
case SND_SOC_DAIFMT_CBS_CFS:
2847
+
case SND_SOC_DAIFMT_CBC_CFC:
2848
2848
reg_val |= RT5645_I2S_MS_S;
2849
2849
rt5645->master[dai->id] = 0;
2850
2850
break;
+2
-2
sound/soc/codecs/rt5651.c
+2
-2
sound/soc/codecs/rt5651.c
···
1352
1352
unsigned int reg_val = 0;
1353
1353
1354
1354
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
1355
-
case SND_SOC_DAIFMT_CBM_CFM:
1355
+
case SND_SOC_DAIFMT_CBP_CFP:
1356
1356
rt5651->master[dai->id] = 1;
1357
1357
break;
1358
-
case SND_SOC_DAIFMT_CBS_CFS:
1358
+
case SND_SOC_DAIFMT_CBC_CFC:
1359
1359
reg_val |= RT5651_I2S_MS_S;
1360
1360
rt5651->master[dai->id] = 0;
1361
1361
break;
+2
-2
sound/soc/codecs/rt5659.c
+2
-2
sound/soc/codecs/rt5659.c
···
3363
3363
unsigned int reg_val = 0;
3364
3364
3365
3365
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
3366
-
case SND_SOC_DAIFMT_CBM_CFM:
3366
+
case SND_SOC_DAIFMT_CBP_CFP:
3367
3367
rt5659->master[dai->id] = 1;
3368
3368
break;
3369
-
case SND_SOC_DAIFMT_CBS_CFS:
3369
+
case SND_SOC_DAIFMT_CBC_CFC:
3370
3370
reg_val |= RT5659_I2S_MS_S;
3371
3371
rt5659->master[dai->id] = 0;
3372
3372
break;
+2
-2
sound/soc/codecs/rt5660.c
+2
-2
sound/soc/codecs/rt5660.c
···
905
905
unsigned int reg_val = 0;
906
906
907
907
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
908
-
case SND_SOC_DAIFMT_CBM_CFM:
908
+
case SND_SOC_DAIFMT_CBP_CFP:
909
909
rt5660->master[dai->id] = 1;
910
910
break;
911
911
912
-
case SND_SOC_DAIFMT_CBS_CFS:
912
+
case SND_SOC_DAIFMT_CBC_CFC:
913
913
reg_val |= RT5660_I2S_MS_S;
914
914
rt5660->master[dai->id] = 0;
915
915
break;
+2
-2
sound/soc/codecs/rt5663.c
+2
-2
sound/soc/codecs/rt5663.c
···
2814
2814
unsigned int reg_val = 0;
2815
2815
2816
2816
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
2817
-
case SND_SOC_DAIFMT_CBM_CFM:
2817
+
case SND_SOC_DAIFMT_CBP_CFP:
2818
2818
break;
2819
-
case SND_SOC_DAIFMT_CBS_CFS:
2819
+
case SND_SOC_DAIFMT_CBC_CFC:
2820
2820
reg_val |= RT5663_I2S_MS_S;
2821
2821
break;
2822
2822
default:
+2
-2
sound/soc/codecs/rt5665.c
+2
-2
sound/soc/codecs/rt5665.c
···
4219
4219
unsigned int reg_val = 0;
4220
4220
4221
4221
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
4222
-
case SND_SOC_DAIFMT_CBM_CFM:
4222
+
case SND_SOC_DAIFMT_CBP_CFP:
4223
4223
rt5665->master[dai->id] = 1;
4224
4224
break;
4225
-
case SND_SOC_DAIFMT_CBS_CFS:
4225
+
case SND_SOC_DAIFMT_CBC_CFC:
4226
4226
reg_val |= RT5665_I2S_MS_S;
4227
4227
rt5665->master[dai->id] = 0;
4228
4228
break;
+2
-2
sound/soc/codecs/rt5668.c
+2
-2
sound/soc/codecs/rt5668.c
···
2010
2010
unsigned int reg_val = 0, tdm_ctrl = 0;
2011
2011
2012
2012
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
2013
-
case SND_SOC_DAIFMT_CBM_CFM:
2013
+
case SND_SOC_DAIFMT_CBP_CFP:
2014
2014
rt5668->master[dai->id] = 1;
2015
2015
break;
2016
-
case SND_SOC_DAIFMT_CBS_CFS:
2016
+
case SND_SOC_DAIFMT_CBC_CFC:
2017
2017
rt5668->master[dai->id] = 0;
2018
2018
break;
2019
2019
default:
+2
-2
sound/soc/codecs/rt5670.c
+2
-2
sound/soc/codecs/rt5670.c
···
2439
2439
unsigned int reg_val = 0;
2440
2440
2441
2441
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
2442
-
case SND_SOC_DAIFMT_CBM_CFM:
2442
+
case SND_SOC_DAIFMT_CBP_CFP:
2443
2443
rt5670->master[dai->id] = 1;
2444
2444
break;
2445
-
case SND_SOC_DAIFMT_CBS_CFS:
2445
+
case SND_SOC_DAIFMT_CBC_CFC:
2446
2446
reg_val |= RT5670_I2S_MS_S;
2447
2447
rt5670->master[dai->id] = 0;
2448
2448
break;
+2
-2
sound/soc/codecs/rt5677.c
+2
-2
sound/soc/codecs/rt5677.c
···
4377
4377
unsigned int reg_val = 0;
4378
4378
4379
4379
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
4380
-
case SND_SOC_DAIFMT_CBM_CFM:
4380
+
case SND_SOC_DAIFMT_CBP_CFP:
4381
4381
rt5677->master[dai->id] = 1;
4382
4382
break;
4383
-
case SND_SOC_DAIFMT_CBS_CFS:
4383
+
case SND_SOC_DAIFMT_CBC_CFC:
4384
4384
reg_val |= RT5677_I2S_MS_S;
4385
4385
rt5677->master[dai->id] = 0;
4386
4386
break;
+2
-2
sound/soc/codecs/rt5682.c
+2
-2
sound/soc/codecs/rt5682.c
···
2225
2225
unsigned int reg_val = 0, tdm_ctrl = 0;
2226
2226
2227
2227
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
2228
-
case SND_SOC_DAIFMT_CBM_CFM:
2228
+
case SND_SOC_DAIFMT_CBP_CFP:
2229
2229
rt5682->master[dai->id] = 1;
2230
2230
break;
2231
-
case SND_SOC_DAIFMT_CBS_CFS:
2231
+
case SND_SOC_DAIFMT_CBC_CFC:
2232
2232
rt5682->master[dai->id] = 0;
2233
2233
break;
2234
2234
default:
+2
-2
sound/soc/codecs/rt5682s.c
+2
-2
sound/soc/codecs/rt5682s.c
···
2132
2132
unsigned int reg_val = 0, tdm_ctrl = 0;
2133
2133
2134
2134
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
2135
-
case SND_SOC_DAIFMT_CBM_CFM:
2135
+
case SND_SOC_DAIFMT_CBP_CFP:
2136
2136
rt5682s->master[dai->id] = 1;
2137
2137
break;
2138
-
case SND_SOC_DAIFMT_CBS_CFS:
2138
+
case SND_SOC_DAIFMT_CBC_CFC:
2139
2139
rt5682s->master[dai->id] = 0;
2140
2140
break;
2141
2141
default:
+2
-2
sound/soc/codecs/sgtl5000.c
+2
-2
sound/soc/codecs/sgtl5000.c
···
806
806
* - clock and frame master
807
807
*/
808
808
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
809
-
case SND_SOC_DAIFMT_CBS_CFS:
809
+
case SND_SOC_DAIFMT_CBC_CFC:
810
810
break;
811
-
case SND_SOC_DAIFMT_CBM_CFM:
811
+
case SND_SOC_DAIFMT_CBP_CFP:
812
812
i2sctl |= SGTL5000_I2S_MASTER;
813
813
sgtl5000->master = 1;
814
814
break;
+2
-2
sound/soc/codecs/src4xxx.c
+2
-2
sound/soc/codecs/src4xxx.c
···
158
158
unsigned int ctrl;
159
159
160
160
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
161
-
case SND_SOC_DAIFMT_CBM_CFM:
161
+
case SND_SOC_DAIFMT_CBP_CFP:
162
162
ctrl = SRC4XXX_BUS_MASTER;
163
163
src4xxx->master[dai->id] = true;
164
164
break;
165
-
case SND_SOC_DAIFMT_CBS_CFS:
165
+
case SND_SOC_DAIFMT_CBC_CFC:
166
166
ctrl = 0;
167
167
src4xxx->master[dai->id] = false;
168
168
break;
+1
-1
sound/soc/codecs/twl4030.c
+1
-1
sound/soc/codecs/twl4030.c
+4
-4
sound/soc/codecs/wm2200.c
+4
-4
sound/soc/codecs/wm2200.c
···
1576
1576
}
1577
1577
1578
1578
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
1579
-
case SND_SOC_DAIFMT_CBS_CFS:
1579
+
case SND_SOC_DAIFMT_CBC_CFC:
1580
1580
break;
1581
-
case SND_SOC_DAIFMT_CBS_CFM:
1581
+
case SND_SOC_DAIFMT_CBC_CFP:
1582
1582
lrclk |= WM2200_AIF1TX_LRCLK_MSTR;
1583
1583
break;
1584
-
case SND_SOC_DAIFMT_CBM_CFS:
1584
+
case SND_SOC_DAIFMT_CBP_CFC:
1585
1585
bclk |= WM2200_AIF1_BCLK_MSTR;
1586
1586
break;
1587
-
case SND_SOC_DAIFMT_CBM_CFM:
1587
+
case SND_SOC_DAIFMT_CBP_CFP:
1588
1588
lrclk |= WM2200_AIF1TX_LRCLK_MSTR;
1589
1589
bclk |= WM2200_AIF1_BCLK_MSTR;
1590
1590
break;
+4
-4
sound/soc/codecs/wm5100.c
+4
-4
sound/soc/codecs/wm5100.c
···
1303
1303
}
1304
1304
1305
1305
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
1306
-
case SND_SOC_DAIFMT_CBS_CFS:
1306
+
case SND_SOC_DAIFMT_CBC_CFC:
1307
1307
break;
1308
-
case SND_SOC_DAIFMT_CBS_CFM:
1308
+
case SND_SOC_DAIFMT_CBC_CFP:
1309
1309
lrclk |= WM5100_AIF1TX_LRCLK_MSTR;
1310
1310
break;
1311
-
case SND_SOC_DAIFMT_CBM_CFS:
1311
+
case SND_SOC_DAIFMT_CBP_CFC:
1312
1312
bclk |= WM5100_AIF1_BCLK_MSTR;
1313
1313
break;
1314
-
case SND_SOC_DAIFMT_CBM_CFM:
1314
+
case SND_SOC_DAIFMT_CBP_CFP:
1315
1315
lrclk |= WM5100_AIF1TX_LRCLK_MSTR;
1316
1316
bclk |= WM5100_AIF1_BCLK_MSTR;
1317
1317
break;
+2
-2
sound/soc/codecs/wm8350.c
+2
-2
sound/soc/codecs/wm8350.c
···
846
846
847
847
/* set master/slave audio interface */
848
848
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
849
-
case SND_SOC_DAIFMT_CBM_CFM:
849
+
case SND_SOC_DAIFMT_CBP_CFP:
850
850
master |= WM8350_BCLK_MSTR;
851
851
dac_lrc |= WM8350_DACLRC_ENA;
852
852
adc_lrc |= WM8350_ADCLRC_ENA;
853
853
break;
854
-
case SND_SOC_DAIFMT_CBS_CFS:
854
+
case SND_SOC_DAIFMT_CBC_CFC:
855
855
break;
856
856
default:
857
857
return -EINVAL;
+2
-2
sound/soc/codecs/wm8400.c
+2
-2
sound/soc/codecs/wm8400.c
···
986
986
987
987
/* set master/slave audio interface */
988
988
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
989
-
case SND_SOC_DAIFMT_CBS_CFS:
989
+
case SND_SOC_DAIFMT_CBC_CFC:
990
990
audio3 &= ~WM8400_AIF_MSTR1;
991
991
break;
992
-
case SND_SOC_DAIFMT_CBM_CFM:
992
+
case SND_SOC_DAIFMT_CBP_CFP:
993
993
audio3 |= WM8400_AIF_MSTR1;
994
994
break;
995
995
default:
+2
-2
sound/soc/codecs/wm8510.c
+2
-2
sound/soc/codecs/wm8510.c
···
389
389
390
390
/* set master/slave audio interface */
391
391
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
392
-
case SND_SOC_DAIFMT_CBM_CFM:
392
+
case SND_SOC_DAIFMT_CBP_CFP:
393
393
clk |= 0x0001;
394
394
break;
395
-
case SND_SOC_DAIFMT_CBS_CFS:
395
+
case SND_SOC_DAIFMT_CBC_CFC:
396
396
break;
397
397
default:
398
398
return -EINVAL;
+2
-2
sound/soc/codecs/wm8523.c
+2
-2
sound/soc/codecs/wm8523.c
···
264
264
WM8523_FMT_MASK | WM8523_AIF_MSTR_MASK);
265
265
266
266
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
267
-
case SND_SOC_DAIFMT_CBM_CFM:
267
+
case SND_SOC_DAIFMT_CBP_CFP:
268
268
aifctrl1 |= WM8523_AIF_MSTR;
269
269
break;
270
-
case SND_SOC_DAIFMT_CBS_CFS:
270
+
case SND_SOC_DAIFMT_CBC_CFC:
271
271
break;
272
272
default:
273
273
return -EINVAL;
+1
-1
sound/soc/codecs/wm8524.c
+1
-1
sound/soc/codecs/wm8524.c
+2
-2
sound/soc/codecs/wm8580.c
+2
-2
sound/soc/codecs/wm8580.c
···
614
614
aifb &= ~(WM8580_AIF_FMT_MASK | WM8580_AIF_LRP | WM8580_AIF_BCP);
615
615
616
616
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
617
-
case SND_SOC_DAIFMT_CBS_CFS:
617
+
case SND_SOC_DAIFMT_CBC_CFC:
618
618
aifa &= ~WM8580_AIF_MS;
619
619
break;
620
-
case SND_SOC_DAIFMT_CBM_CFM:
620
+
case SND_SOC_DAIFMT_CBP_CFP:
621
621
aifa |= WM8580_AIF_MS;
622
622
break;
623
623
default:
+2
-2
sound/soc/codecs/wm8711.c
+2
-2
sound/soc/codecs/wm8711.c
···
243
243
244
244
/* set master/slave audio interface */
245
245
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
246
-
case SND_SOC_DAIFMT_CBM_CFM:
246
+
case SND_SOC_DAIFMT_CBP_CFP:
247
247
iface |= 0x0040;
248
248
break;
249
-
case SND_SOC_DAIFMT_CBS_CFS:
249
+
case SND_SOC_DAIFMT_CBC_CFC:
250
250
break;
251
251
default:
252
252
return -EINVAL;
+1
-1
sound/soc/codecs/wm8728.c
+1
-1
sound/soc/codecs/wm8728.c
+2
-2
sound/soc/codecs/wm8737.c
+2
-2
sound/soc/codecs/wm8737.c
···
404
404
u16 af = 0;
405
405
406
406
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
407
-
case SND_SOC_DAIFMT_CBM_CFM:
407
+
case SND_SOC_DAIFMT_CBP_CFP:
408
408
af |= WM8737_MS;
409
409
break;
410
-
case SND_SOC_DAIFMT_CBS_CFS:
410
+
case SND_SOC_DAIFMT_CBC_CFC:
411
411
break;
412
412
default:
413
413
return -EINVAL;
+1
-1
sound/soc/codecs/wm8741.c
+1
-1
sound/soc/codecs/wm8741.c
+2
-2
sound/soc/codecs/wm8750.c
+2
-2
sound/soc/codecs/wm8750.c
···
522
522
523
523
/* set master/slave audio interface */
524
524
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
525
-
case SND_SOC_DAIFMT_CBM_CFM:
525
+
case SND_SOC_DAIFMT_CBP_CFP:
526
526
iface = 0x0040;
527
527
break;
528
-
case SND_SOC_DAIFMT_CBS_CFS:
528
+
case SND_SOC_DAIFMT_CBC_CFC:
529
529
break;
530
530
default:
531
531
return -EINVAL;
+6
-6
sound/soc/codecs/wm8753.c
+6
-6
sound/soc/codecs/wm8753.c
···
963
963
964
964
/* set master/slave audio interface */
965
965
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
966
-
case SND_SOC_DAIFMT_CBS_CFS:
966
+
case SND_SOC_DAIFMT_CBC_CFC:
967
967
break;
968
-
case SND_SOC_DAIFMT_CBM_CFM:
968
+
case SND_SOC_DAIFMT_CBP_CFP:
969
969
ioctl |= 0x2;
970
970
fallthrough;
971
-
case SND_SOC_DAIFMT_CBM_CFS:
971
+
case SND_SOC_DAIFMT_CBP_CFC:
972
972
voice |= 0x0040;
973
973
break;
974
974
default:
···
1089
1089
1090
1090
/* set master/slave audio interface */
1091
1091
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
1092
-
case SND_SOC_DAIFMT_CBS_CFS:
1092
+
case SND_SOC_DAIFMT_CBC_CFC:
1093
1093
break;
1094
-
case SND_SOC_DAIFMT_CBM_CFM:
1094
+
case SND_SOC_DAIFMT_CBP_CFP:
1095
1095
ioctl |= 0x1;
1096
1096
fallthrough;
1097
-
case SND_SOC_DAIFMT_CBM_CFS:
1097
+
case SND_SOC_DAIFMT_CBP_CFC:
1098
1098
hifi |= 0x0040;
1099
1099
break;
1100
1100
default:
+2
-2
sound/soc/codecs/wm8770.c
+2
-2
sound/soc/codecs/wm8770.c
···
349
349
component = dai->component;
350
350
351
351
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
352
-
case SND_SOC_DAIFMT_CBM_CFM:
352
+
case SND_SOC_DAIFMT_CBP_CFP:
353
353
master = 0x100;
354
354
break;
355
-
case SND_SOC_DAIFMT_CBS_CFS:
355
+
case SND_SOC_DAIFMT_CBC_CFC:
356
356
master = 0;
357
357
break;
358
358
default:
+2
-2
sound/soc/codecs/wm8776.c
+2
-2
sound/soc/codecs/wm8776.c
+2
-2
sound/soc/codecs/wm8804.c
+2
-2
sound/soc/codecs/wm8804.c
···
243
243
snd_soc_component_update_bits(component, WM8804_AIFRX, 0x3, format);
244
244
245
245
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
246
-
case SND_SOC_DAIFMT_CBM_CFM:
246
+
case SND_SOC_DAIFMT_CBP_CFP:
247
247
master = 1;
248
248
break;
249
-
case SND_SOC_DAIFMT_CBS_CFS:
249
+
case SND_SOC_DAIFMT_CBC_CFC:
250
250
master = 0;
251
251
break;
252
252
default:
+4
-4
sound/soc/codecs/wm8900.c
+4
-4
sound/soc/codecs/wm8900.c
···
867
867
868
868
/* set master/slave audio interface */
869
869
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
870
-
case SND_SOC_DAIFMT_CBS_CFS:
870
+
case SND_SOC_DAIFMT_CBC_CFC:
871
871
clocking1 &= ~WM8900_REG_CLOCKING1_BCLK_DIR;
872
872
aif3 &= ~WM8900_REG_AUDIO3_ADCLRC_DIR;
873
873
aif4 &= ~WM8900_REG_AUDIO4_DACLRC_DIR;
874
874
break;
875
-
case SND_SOC_DAIFMT_CBS_CFM:
875
+
case SND_SOC_DAIFMT_CBC_CFP:
876
876
clocking1 &= ~WM8900_REG_CLOCKING1_BCLK_DIR;
877
877
aif3 |= WM8900_REG_AUDIO3_ADCLRC_DIR;
878
878
aif4 |= WM8900_REG_AUDIO4_DACLRC_DIR;
879
879
break;
880
-
case SND_SOC_DAIFMT_CBM_CFM:
880
+
case SND_SOC_DAIFMT_CBP_CFP:
881
881
clocking1 |= WM8900_REG_CLOCKING1_BCLK_DIR;
882
882
aif3 |= WM8900_REG_AUDIO3_ADCLRC_DIR;
883
883
aif4 |= WM8900_REG_AUDIO4_DACLRC_DIR;
884
884
break;
885
-
case SND_SOC_DAIFMT_CBM_CFS:
885
+
case SND_SOC_DAIFMT_CBP_CFC:
886
886
clocking1 |= WM8900_REG_CLOCKING1_BCLK_DIR;
887
887
aif3 &= ~WM8900_REG_AUDIO3_ADCLRC_DIR;
888
888
aif4 &= ~WM8900_REG_AUDIO4_DACLRC_DIR;
+4
-4
sound/soc/codecs/wm8903.c
+4
-4
sound/soc/codecs/wm8903.c
···
1229
1229
WM8903_AIF_LRCLK_INV | WM8903_AIF_BCLK_INV);
1230
1230
1231
1231
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
1232
-
case SND_SOC_DAIFMT_CBS_CFS:
1232
+
case SND_SOC_DAIFMT_CBC_CFC:
1233
1233
break;
1234
-
case SND_SOC_DAIFMT_CBS_CFM:
1234
+
case SND_SOC_DAIFMT_CBC_CFP:
1235
1235
aif1 |= WM8903_LRCLK_DIR;
1236
1236
break;
1237
-
case SND_SOC_DAIFMT_CBM_CFM:
1237
+
case SND_SOC_DAIFMT_CBP_CFP:
1238
1238
aif1 |= WM8903_LRCLK_DIR | WM8903_BCLK_DIR;
1239
1239
break;
1240
-
case SND_SOC_DAIFMT_CBM_CFS:
1240
+
case SND_SOC_DAIFMT_CBP_CFC:
1241
1241
aif1 |= WM8903_BCLK_DIR;
1242
1242
break;
1243
1243
default:
+4
-4
sound/soc/codecs/wm8904.c
+4
-4
sound/soc/codecs/wm8904.c
···
1424
1424
unsigned int aif3 = 0;
1425
1425
1426
1426
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
1427
-
case SND_SOC_DAIFMT_CBS_CFS:
1427
+
case SND_SOC_DAIFMT_CBC_CFC:
1428
1428
break;
1429
-
case SND_SOC_DAIFMT_CBS_CFM:
1429
+
case SND_SOC_DAIFMT_CBC_CFP:
1430
1430
aif3 |= WM8904_LRCLK_DIR;
1431
1431
break;
1432
-
case SND_SOC_DAIFMT_CBM_CFS:
1432
+
case SND_SOC_DAIFMT_CBP_CFC:
1433
1433
aif1 |= WM8904_BCLK_DIR;
1434
1434
break;
1435
-
case SND_SOC_DAIFMT_CBM_CFM:
1435
+
case SND_SOC_DAIFMT_CBP_CFP:
1436
1436
aif1 |= WM8904_BCLK_DIR;
1437
1437
aif3 |= WM8904_LRCLK_DIR;
1438
1438
break;
+2
-2
sound/soc/codecs/wm8940.c
+2
-2
sound/soc/codecs/wm8940.c
···
343
343
u16 clk = snd_soc_component_read(component, WM8940_CLOCK) & 0x1fe;
344
344
345
345
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
346
-
case SND_SOC_DAIFMT_CBM_CFM:
346
+
case SND_SOC_DAIFMT_CBP_CFP:
347
347
clk |= 1;
348
348
break;
349
-
case SND_SOC_DAIFMT_CBS_CFS:
349
+
case SND_SOC_DAIFMT_CBC_CFC:
350
350
break;
351
351
default:
352
352
return -EINVAL;
+2
-2
sound/soc/codecs/wm8955.c
+2
-2
sound/soc/codecs/wm8955.c
+2
-2
sound/soc/codecs/wm8960.c
+2
-2
sound/soc/codecs/wm8960.c
···
540
540
541
541
/* set master/slave audio interface */
542
542
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
543
-
case SND_SOC_DAIFMT_CBM_CFM:
543
+
case SND_SOC_DAIFMT_CBP_CFP:
544
544
iface |= 0x0040;
545
545
break;
546
-
case SND_SOC_DAIFMT_CBS_CFS:
546
+
case SND_SOC_DAIFMT_CBC_CFC:
547
547
break;
548
548
default:
549
549
return -EINVAL;
+2
-2
sound/soc/codecs/wm8961.c
+2
-2
sound/soc/codecs/wm8961.c
···
627
627
WM8961_MS | WM8961_FORMAT_MASK);
628
628
629
629
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
630
-
case SND_SOC_DAIFMT_CBM_CFM:
630
+
case SND_SOC_DAIFMT_CBP_CFP:
631
631
aif |= WM8961_MS;
632
632
break;
633
-
case SND_SOC_DAIFMT_CBS_CFS:
633
+
case SND_SOC_DAIFMT_CBC_CFC:
634
634
break;
635
635
default:
636
636
return -EINVAL;
+2
-2
sound/soc/codecs/wm8962.c
+2
-2
sound/soc/codecs/wm8962.c
···
2762
2762
}
2763
2763
2764
2764
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
2765
-
case SND_SOC_DAIFMT_CBM_CFM:
2765
+
case SND_SOC_DAIFMT_CBP_CFP:
2766
2766
aif0 |= WM8962_MSTR;
2767
2767
break;
2768
-
case SND_SOC_DAIFMT_CBS_CFS:
2768
+
case SND_SOC_DAIFMT_CBC_CFC:
2769
2769
break;
2770
2770
default:
2771
2771
return -EINVAL;
+2
-2
sound/soc/codecs/wm8971.c
+2
-2
sound/soc/codecs/wm8971.c
···
452
452
453
453
/* set master/slave audio interface */
454
454
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
455
-
case SND_SOC_DAIFMT_CBM_CFM:
455
+
case SND_SOC_DAIFMT_CBP_CFP:
456
456
iface = 0x0040;
457
457
break;
458
-
case SND_SOC_DAIFMT_CBS_CFS:
458
+
case SND_SOC_DAIFMT_CBC_CFC:
459
459
break;
460
460
default:
461
461
return -EINVAL;
+2
-2
sound/soc/codecs/wm8974.c
+2
-2
sound/soc/codecs/wm8974.c
···
454
454
455
455
/* set master/slave audio interface */
456
456
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
457
-
case SND_SOC_DAIFMT_CBM_CFM:
457
+
case SND_SOC_DAIFMT_CBP_CFP:
458
458
clk |= 0x0001;
459
459
break;
460
-
case SND_SOC_DAIFMT_CBS_CFS:
460
+
case SND_SOC_DAIFMT_CBC_CFC:
461
461
break;
462
462
default:
463
463
return -EINVAL;
+2
-2
sound/soc/codecs/wm8978.c
+2
-2
sound/soc/codecs/wm8978.c
···
660
660
661
661
/* set master/slave audio interface */
662
662
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
663
-
case SND_SOC_DAIFMT_CBM_CFM:
663
+
case SND_SOC_DAIFMT_CBP_CFP:
664
664
clk |= 1;
665
665
break;
666
-
case SND_SOC_DAIFMT_CBS_CFS:
666
+
case SND_SOC_DAIFMT_CBC_CFC:
667
667
clk &= ~1;
668
668
break;
669
669
default:
+2
-2
sound/soc/codecs/wm8983.c
+2
-2
sound/soc/codecs/wm8983.c
···
594
594
WM8983_FMT_MASK, format << WM8983_FMT_SHIFT);
595
595
596
596
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
597
-
case SND_SOC_DAIFMT_CBM_CFM:
597
+
case SND_SOC_DAIFMT_CBP_CFP:
598
598
master = 1;
599
599
break;
600
-
case SND_SOC_DAIFMT_CBS_CFS:
600
+
case SND_SOC_DAIFMT_CBC_CFC:
601
601
master = 0;
602
602
break;
603
603
default:
+2
-2
sound/soc/codecs/wm8985.c
+2
-2
sound/soc/codecs/wm8985.c
···
688
688
WM8985_FMT_MASK, format << WM8985_FMT_SHIFT);
689
689
690
690
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
691
-
case SND_SOC_DAIFMT_CBM_CFM:
691
+
case SND_SOC_DAIFMT_CBP_CFP:
692
692
master = 1;
693
693
break;
694
-
case SND_SOC_DAIFMT_CBS_CFS:
694
+
case SND_SOC_DAIFMT_CBC_CFC:
695
695
master = 0;
696
696
break;
697
697
default:
+2
-2
sound/soc/codecs/wm8988.c
+2
-2
sound/soc/codecs/wm8988.c
···
589
589
590
590
/* set master/slave audio interface */
591
591
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
592
-
case SND_SOC_DAIFMT_CBM_CFM:
592
+
case SND_SOC_DAIFMT_CBP_CFP:
593
593
iface = 0x0040;
594
594
break;
595
-
case SND_SOC_DAIFMT_CBS_CFS:
595
+
case SND_SOC_DAIFMT_CBC_CFC:
596
596
break;
597
597
default:
598
598
return -EINVAL;
+2
-2
sound/soc/codecs/wm8990.c
+2
-2
sound/soc/codecs/wm8990.c
···
897
897
898
898
/* set master/slave audio interface */
899
899
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
900
-
case SND_SOC_DAIFMT_CBS_CFS:
900
+
case SND_SOC_DAIFMT_CBC_CFC:
901
901
audio3 &= ~WM8990_AIF_MSTR1;
902
902
break;
903
-
case SND_SOC_DAIFMT_CBM_CFM:
903
+
case SND_SOC_DAIFMT_CBP_CFP:
904
904
audio3 |= WM8990_AIF_MSTR1;
905
905
break;
906
906
default:
+2
-2
sound/soc/codecs/wm8991.c
+2
-2
sound/soc/codecs/wm8991.c
···
958
958
959
959
/* set master/slave audio interface */
960
960
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
961
-
case SND_SOC_DAIFMT_CBS_CFS:
961
+
case SND_SOC_DAIFMT_CBC_CFC:
962
962
audio3 &= ~WM8991_AIF_MSTR1;
963
963
break;
964
-
case SND_SOC_DAIFMT_CBM_CFM:
964
+
case SND_SOC_DAIFMT_CBP_CFP:
965
965
audio3 |= WM8991_AIF_MSTR1;
966
966
break;
967
967
default:
+4
-4
sound/soc/codecs/wm8993.c
+4
-4
sound/soc/codecs/wm8993.c
···
1098
1098
aif4 &= ~WM8993_LRCLK_DIR;
1099
1099
1100
1100
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
1101
-
case SND_SOC_DAIFMT_CBS_CFS:
1101
+
case SND_SOC_DAIFMT_CBC_CFC:
1102
1102
wm8993->master = 0;
1103
1103
break;
1104
-
case SND_SOC_DAIFMT_CBS_CFM:
1104
+
case SND_SOC_DAIFMT_CBC_CFP:
1105
1105
aif4 |= WM8993_LRCLK_DIR;
1106
1106
wm8993->master = 1;
1107
1107
break;
1108
-
case SND_SOC_DAIFMT_CBM_CFS:
1108
+
case SND_SOC_DAIFMT_CBP_CFC:
1109
1109
aif1 |= WM8993_BCLK_DIR;
1110
1110
wm8993->master = 1;
1111
1111
break;
1112
-
case SND_SOC_DAIFMT_CBM_CFM:
1112
+
case SND_SOC_DAIFMT_CBP_CFP:
1113
1113
aif1 |= WM8993_BCLK_DIR;
1114
1114
aif4 |= WM8993_LRCLK_DIR;
1115
1115
wm8993->master = 1;
+2
-2
sound/soc/codecs/wm8994.c
+2
-2
sound/soc/codecs/wm8994.c
···
2783
2783
}
2784
2784
2785
2785
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
2786
-
case SND_SOC_DAIFMT_CBS_CFS:
2786
+
case SND_SOC_DAIFMT_CBC_CFC:
2787
2787
break;
2788
-
case SND_SOC_DAIFMT_CBM_CFM:
2788
+
case SND_SOC_DAIFMT_CBP_CFP:
2789
2789
ms = WM8994_AIF1_MSTR;
2790
2790
break;
2791
2791
default:
+2
-2
sound/soc/codecs/wm8995.c
+2
-2
sound/soc/codecs/wm8995.c
···
1448
1448
1449
1449
master = 0;
1450
1450
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
1451
-
case SND_SOC_DAIFMT_CBS_CFS:
1451
+
case SND_SOC_DAIFMT_CBC_CFC:
1452
1452
break;
1453
-
case SND_SOC_DAIFMT_CBM_CFM:
1453
+
case SND_SOC_DAIFMT_CBP_CFP:
1454
1454
master = WM8995_AIF1_MSTR;
1455
1455
break;
1456
1456
default:
+4
-4
sound/soc/codecs/wm8996.c
+4
-4
sound/soc/codecs/wm8996.c
···
1672
1672
}
1673
1673
1674
1674
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
1675
-
case SND_SOC_DAIFMT_CBS_CFS:
1675
+
case SND_SOC_DAIFMT_CBC_CFC:
1676
1676
break;
1677
-
case SND_SOC_DAIFMT_CBS_CFM:
1677
+
case SND_SOC_DAIFMT_CBC_CFP:
1678
1678
lrclk_tx |= WM8996_AIF1TX_LRCLK_MSTR;
1679
1679
lrclk_rx |= WM8996_AIF1RX_LRCLK_MSTR;
1680
1680
break;
1681
-
case SND_SOC_DAIFMT_CBM_CFS:
1681
+
case SND_SOC_DAIFMT_CBP_CFC:
1682
1682
bclk |= WM8996_AIF1_BCLK_MSTR;
1683
1683
break;
1684
-
case SND_SOC_DAIFMT_CBM_CFM:
1684
+
case SND_SOC_DAIFMT_CBP_CFP:
1685
1685
bclk |= WM8996_AIF1_BCLK_MSTR;
1686
1686
lrclk_tx |= WM8996_AIF1TX_LRCLK_MSTR;
1687
1687
lrclk_rx |= WM8996_AIF1RX_LRCLK_MSTR;
+4
-4
sound/soc/codecs/wm9081.c
+4
-4
sound/soc/codecs/wm9081.c
···
907
907
WM9081_BCLK_DIR | WM9081_LRCLK_DIR | WM9081_AIF_FMT_MASK);
908
908
909
909
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
910
-
case SND_SOC_DAIFMT_CBS_CFS:
910
+
case SND_SOC_DAIFMT_CBC_CFC:
911
911
wm9081->master = 0;
912
912
break;
913
-
case SND_SOC_DAIFMT_CBS_CFM:
913
+
case SND_SOC_DAIFMT_CBC_CFP:
914
914
aif2 |= WM9081_LRCLK_DIR;
915
915
wm9081->master = 1;
916
916
break;
917
-
case SND_SOC_DAIFMT_CBM_CFS:
917
+
case SND_SOC_DAIFMT_CBP_CFC:
918
918
aif2 |= WM9081_BCLK_DIR;
919
919
wm9081->master = 1;
920
920
break;
921
-
case SND_SOC_DAIFMT_CBM_CFM:
921
+
case SND_SOC_DAIFMT_CBP_CFP:
922
922
aif2 |= WM9081_LRCLK_DIR | WM9081_BCLK_DIR;
923
923
wm9081->master = 1;
924
924
break;
+4
-4
sound/soc/codecs/wm9713.c
+4
-4
sound/soc/codecs/wm9713.c
···
944
944
945
945
/* clock masters */
946
946
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
947
-
case SND_SOC_DAIFMT_CBM_CFM:
947
+
case SND_SOC_DAIFMT_CBP_CFP:
948
948
reg |= 0x4000;
949
949
gpio |= 0x0010;
950
950
break;
951
-
case SND_SOC_DAIFMT_CBM_CFS:
951
+
case SND_SOC_DAIFMT_CBP_CFC:
952
952
reg |= 0x6000;
953
953
gpio |= 0x0018;
954
954
break;
955
-
case SND_SOC_DAIFMT_CBS_CFS:
955
+
case SND_SOC_DAIFMT_CBC_CFC:
956
956
reg |= 0x2000;
957
957
gpio |= 0x001a;
958
958
break;
959
-
case SND_SOC_DAIFMT_CBS_CFM:
959
+
case SND_SOC_DAIFMT_CBC_CFP:
960
960
gpio |= 0x0012;
961
961
break;
962
962
}
+2
-2
sound/soc/fsl/fsl-asoc-card.c
+2
-2
sound/soc/fsl/fsl-asoc-card.c
···
759
759
priv->dai_fmt |= SND_SOC_DAIFMT_CBP_CFP;
760
760
} else if (of_device_is_compatible(np, "fsl,imx-audio-tlv320aic31xx")) {
761
761
codec_dai_name[0] = "tlv320dac31xx-hifi";
762
-
priv->dai_fmt |= SND_SOC_DAIFMT_CBS_CFS;
762
+
priv->dai_fmt |= SND_SOC_DAIFMT_CBC_CFC;
763
763
priv->dai_link[1].playback_only = 1;
764
764
priv->dai_link[2].playback_only = 1;
765
765
priv->cpu_priv.sysclk_dir[TX] = SND_SOC_CLOCK_OUT;
···
818
818
priv->codec_priv[0].mclk_id = NAU8822_CLK_MCLK;
819
819
priv->codec_priv[0].fll_id = NAU8822_CLK_PLL;
820
820
priv->codec_priv[0].pll_id = NAU8822_CLK_PLL;
821
-
priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;
821
+
priv->dai_fmt |= SND_SOC_DAIFMT_CBP_CFP;
822
822
if (codec_dev[0])
823
823
priv->codec_priv[0].mclk = devm_clk_get(codec_dev[0], NULL);
824
824
} else if (of_device_is_compatible(np, "fsl,imx-audio-wm8904")) {
+1
-1
sound/soc/intel/avs/boards/da7219.c
+1
-1
sound/soc/intel/avs/boards/da7219.c
···
198
198
dl->platforms = platform;
199
199
dl->num_platforms = 1;
200
200
dl->id = 0;
201
-
dl->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS;
201
+
dl->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC;
202
202
dl->be_hw_params_fixup = avs_da7219_be_fixup;
203
203
dl->init = avs_da7219_codec_init;
204
204
dl->exit = avs_da7219_codec_exit;
+1
-1
sound/soc/intel/avs/boards/max98357a.c
+1
-1
sound/soc/intel/avs/boards/max98357a.c
···
78
78
dl->platforms = platform;
79
79
dl->num_platforms = 1;
80
80
dl->id = 0;
81
-
dl->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS;
81
+
dl->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC;
82
82
dl->be_hw_params_fixup = avs_max98357a_be_fixup;
83
83
dl->nonatomic = 1;
84
84
dl->no_pcm = 1;
+1
-1
sound/soc/intel/avs/boards/max98927.c
+1
-1
sound/soc/intel/avs/boards/max98927.c
···
127
127
dl->platforms = platform;
128
128
dl->num_platforms = 1;
129
129
dl->id = 0;
130
-
dl->dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS;
130
+
dl->dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC;
131
131
dl->be_hw_params_fixup = avs_max98927_be_fixup;
132
132
dl->nonatomic = 1;
133
133
dl->no_pcm = 1;
+1
-1
sound/soc/intel/avs/boards/nau8825.c
+1
-1
sound/soc/intel/avs/boards/nau8825.c
···
204
204
dl->platforms = platform;
205
205
dl->num_platforms = 1;
206
206
dl->id = 0;
207
-
dl->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS;
207
+
dl->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC;
208
208
dl->init = avs_nau8825_codec_init;
209
209
dl->exit = avs_nau8825_codec_exit;
210
210
dl->be_hw_params_fixup = avs_nau8825_be_fixup;
+1
-1
sound/soc/intel/avs/boards/rt274.c
+1
-1
sound/soc/intel/avs/boards/rt274.c
···
179
179
dl->platforms = platform;
180
180
dl->num_platforms = 1;
181
181
dl->id = 0;
182
-
dl->dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS;
182
+
dl->dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC;
183
183
dl->init = avs_rt274_codec_init;
184
184
dl->exit = avs_rt274_codec_exit;
185
185
dl->be_hw_params_fixup = avs_rt274_be_fixup;
+1
-1
sound/soc/intel/avs/boards/rt286.c
+1
-1
sound/soc/intel/avs/boards/rt286.c
···
147
147
dl->platforms = platform;
148
148
dl->num_platforms = 1;
149
149
dl->id = 0;
150
-
dl->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS;
150
+
dl->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC;
151
151
dl->init = avs_rt286_codec_init;
152
152
dl->exit = avs_rt286_codec_exit;
153
153
dl->be_hw_params_fixup = avs_rt286_be_fixup;
+2
-2
sound/soc/intel/avs/boards/rt298.c
+2
-2
sound/soc/intel/avs/boards/rt298.c
···
165
165
dl->num_platforms = 1;
166
166
dl->id = 0;
167
167
if (dmi_first_match(kblr_dmi_table))
168
-
dl->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS;
168
+
dl->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC;
169
169
else
170
-
dl->dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS;
170
+
dl->dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC;
171
171
dl->init = avs_rt298_codec_init;
172
172
dl->exit = avs_rt298_codec_exit;
173
173
dl->be_hw_params_fixup = avs_rt298_be_fixup;
+1
-1
sound/soc/intel/avs/boards/rt5514.c
+1
-1
sound/soc/intel/avs/boards/rt5514.c
···
116
116
dl->platforms = platform;
117
117
dl->num_platforms = 1;
118
118
dl->id = 0;
119
-
dl->dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS;
119
+
dl->dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC;
120
120
dl->init = avs_rt5514_codec_init;
121
121
dl->be_hw_params_fixup = avs_rt5514_be_fixup;
122
122
dl->nonatomic = 1;
+1
-1
sound/soc/intel/avs/boards/ssm4567.c
+1
-1
sound/soc/intel/avs/boards/ssm4567.c
···
116
116
dl->platforms = platform;
117
117
dl->num_platforms = 1;
118
118
dl->id = 0;
119
-
dl->dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_CBS_CFS;
119
+
dl->dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_CBC_CFC;
120
120
dl->init = avs_ssm4567_codec_init;
121
121
dl->be_hw_params_fixup = avs_ssm4567_be_fixup;
122
122
dl->nonatomic = 1;
+4
-4
sound/soc/mediatek/mt2701/mt2701-cs42448.c
+4
-4
sound/soc/mediatek/mt2701/mt2701-cs42448.c
···
266
266
[DAI_LINK_BE_I2S0] = {
267
267
.name = "mt2701-cs42448-I2S0",
268
268
.no_pcm = 1,
269
-
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS
269
+
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBC_CFC
270
270
| SND_SOC_DAIFMT_GATED,
271
271
.ops = &mt2701_cs42448_be_ops,
272
272
SND_SOC_DAILINK_REG(be_i2s0),
···
274
274
[DAI_LINK_BE_I2S1] = {
275
275
.name = "mt2701-cs42448-I2S1",
276
276
.no_pcm = 1,
277
-
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS
277
+
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBC_CFC
278
278
| SND_SOC_DAIFMT_GATED,
279
279
.ops = &mt2701_cs42448_be_ops,
280
280
SND_SOC_DAILINK_REG(be_i2s1),
···
282
282
[DAI_LINK_BE_I2S2] = {
283
283
.name = "mt2701-cs42448-I2S2",
284
284
.no_pcm = 1,
285
-
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS
285
+
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBC_CFC
286
286
| SND_SOC_DAIFMT_GATED,
287
287
.ops = &mt2701_cs42448_be_ops,
288
288
SND_SOC_DAILINK_REG(be_i2s2),
···
290
290
[DAI_LINK_BE_I2S3] = {
291
291
.name = "mt2701-cs42448-I2S3",
292
292
.no_pcm = 1,
293
-
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS
293
+
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBC_CFC
294
294
| SND_SOC_DAIFMT_GATED,
295
295
.ops = &mt2701_cs42448_be_ops,
296
296
SND_SOC_DAILINK_REG(be_i2s3),
+1
-1
sound/soc/mediatek/mt2701/mt2701-wm8960.c
+1
-1
sound/soc/mediatek/mt2701/mt2701-wm8960.c
+2
-2
sound/soc/mediatek/mt7986/mt7986-dai-etdm.c
+2
-2
sound/soc/mediatek/mt7986/mt7986-dai-etdm.c
···
348
348
}
349
349
350
350
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
351
-
case SND_SOC_DAIFMT_CBM_CFM:
351
+
case SND_SOC_DAIFMT_CBP_CFP:
352
352
etdm_data->slave_mode = true;
353
353
break;
354
-
case SND_SOC_DAIFMT_CBS_CFS:
354
+
case SND_SOC_DAIFMT_CBC_CFC:
355
355
etdm_data->slave_mode = false;
356
356
break;
357
357
default:
+1
-1
sound/soc/mediatek/mt7986/mt7986-wm8960.c
+1
-1
sound/soc/mediatek/mt7986/mt7986-wm8960.c
+1
-1
sound/soc/mediatek/mt8173/mt8173-max98090.c
+1
-1
sound/soc/mediatek/mt8173/mt8173-max98090.c
+1
-1
sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c
+1
-1
sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c
···
156
156
.no_pcm = 1,
157
157
.init = mt8173_rt5650_rt5514_init,
158
158
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
159
-
SND_SOC_DAIFMT_CBS_CFS,
159
+
SND_SOC_DAIFMT_CBC_CFC,
160
160
.ops = &mt8173_rt5650_rt5514_ops,
161
161
.ignore_pmdown_time = 1,
162
162
SND_SOC_DAILINK_REG(codec),
+2
-2
sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c
+2
-2
sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c
···
197
197
.no_pcm = 1,
198
198
.init = mt8173_rt5650_rt5676_init,
199
199
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
200
-
SND_SOC_DAIFMT_CBS_CFS,
200
+
SND_SOC_DAIFMT_CBC_CFC,
201
201
.ops = &mt8173_rt5650_rt5676_ops,
202
202
.ignore_pmdown_time = 1,
203
203
SND_SOC_DAILINK_REG(codec),
···
214
214
.stream_name = "rt5650_rt5676 intercodec",
215
215
.no_pcm = 1,
216
216
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
217
-
SND_SOC_DAIFMT_CBM_CFM,
217
+
SND_SOC_DAIFMT_CBP_CFP,
218
218
SND_SOC_DAILINK_REG(intercodec),
219
219
},
220
220
};
+1
-1
sound/soc/mediatek/mt8173/mt8173-rt5650.c
+1
-1
sound/soc/mediatek/mt8173/mt8173-rt5650.c
+1
-1
sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
+1
-1
sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
+2
-2
sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
+2
-2
sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
···
575
575
.no_pcm = 1,
576
576
.dai_fmt = SND_SOC_DAIFMT_I2S |
577
577
SND_SOC_DAIFMT_IB_IF |
578
-
SND_SOC_DAIFMT_CBM_CFM,
578
+
SND_SOC_DAIFMT_CBP_CFP,
579
579
.playback_only = 1,
580
580
.ignore_suspend = 1,
581
581
.be_hw_params_fixup = mt8183_i2s_hw_params_fixup,
···
783
783
strcmp(dai_link->name, "I2S3") == 0)
784
784
dai_link->dai_fmt = SND_SOC_DAIFMT_LEFT_J |
785
785
SND_SOC_DAIFMT_NB_NF |
786
-
SND_SOC_DAIFMT_CBM_CFM;
786
+
SND_SOC_DAIFMT_CBP_CFP;
787
787
}
788
788
789
789
if (hdmi_codec && strcmp(dai_link->name, "TDM") == 0) {
+1
-1
sound/soc/mediatek/mt8186/mt8186-mt6366.c
+1
-1
sound/soc/mediatek/mt8186/mt8186-mt6366.c
+1
-1
sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
+1
-1
sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
+6
-6
sound/soc/mediatek/mt8195/mt8195-mt6359.c
+6
-6
sound/soc/mediatek/mt8195/mt8195-mt6359.c
···
1114
1114
.no_pcm = 1,
1115
1115
.dai_fmt = SND_SOC_DAIFMT_I2S |
1116
1116
SND_SOC_DAIFMT_NB_NF |
1117
-
SND_SOC_DAIFMT_CBS_CFS,
1117
+
SND_SOC_DAIFMT_CBC_CFC,
1118
1118
.capture_only = 1,
1119
1119
SND_SOC_DAILINK_REG(ETDM1_IN_BE),
1120
1120
},
···
1123
1123
.no_pcm = 1,
1124
1124
.dai_fmt = SND_SOC_DAIFMT_I2S |
1125
1125
SND_SOC_DAIFMT_NB_NF |
1126
-
SND_SOC_DAIFMT_CBS_CFS,
1126
+
SND_SOC_DAIFMT_CBC_CFC,
1127
1127
.capture_only = 1,
1128
1128
.be_hw_params_fixup = mt8195_etdm_hw_params_fixup,
1129
1129
SND_SOC_DAILINK_REG(ETDM2_IN_BE),
···
1133
1133
.no_pcm = 1,
1134
1134
.dai_fmt = SND_SOC_DAIFMT_I2S |
1135
1135
SND_SOC_DAIFMT_NB_NF |
1136
-
SND_SOC_DAIFMT_CBS_CFS,
1136
+
SND_SOC_DAIFMT_CBC_CFC,
1137
1137
.playback_only = 1,
1138
1138
.be_hw_params_fixup = mt8195_etdm_hw_params_fixup,
1139
1139
SND_SOC_DAILINK_REG(ETDM1_OUT_BE),
···
1143
1143
.no_pcm = 1,
1144
1144
.dai_fmt = SND_SOC_DAIFMT_I2S |
1145
1145
SND_SOC_DAIFMT_NB_NF |
1146
-
SND_SOC_DAIFMT_CBS_CFS,
1146
+
SND_SOC_DAIFMT_CBC_CFC,
1147
1147
.playback_only = 1,
1148
1148
SND_SOC_DAILINK_REG(ETDM2_OUT_BE),
1149
1149
},
···
1152
1152
.no_pcm = 1,
1153
1153
.dai_fmt = SND_SOC_DAIFMT_I2S |
1154
1154
SND_SOC_DAIFMT_NB_NF |
1155
-
SND_SOC_DAIFMT_CBS_CFS,
1155
+
SND_SOC_DAIFMT_CBC_CFC,
1156
1156
.playback_only = 1,
1157
1157
SND_SOC_DAILINK_REG(ETDM3_OUT_BE),
1158
1158
},
···
1161
1161
.no_pcm = 1,
1162
1162
.dai_fmt = SND_SOC_DAIFMT_I2S |
1163
1163
SND_SOC_DAIFMT_NB_NF |
1164
-
SND_SOC_DAIFMT_CBS_CFS,
1164
+
SND_SOC_DAIFMT_CBC_CFC,
1165
1165
SND_SOC_DAILINK_REG(PCM1_BE),
1166
1166
},
1167
1167
[DAI_LINK_UL_SRC1_BE] = {
+6
-6
sound/soc/mediatek/mt8365/mt8365-dai-i2s.c
+6
-6
sound/soc/mediatek/mt8365/mt8365-dai-i2s.c
···
313
313
}
314
314
315
315
if ((be->fmt_mode & SND_SOC_DAIFMT_MASTER_MASK) ==
316
-
SND_SOC_DAIFMT_CBM_CFM) {
316
+
SND_SOC_DAIFMT_CBP_CFP) {
317
317
val |= AFE_I2S_CON_SRC_SLAVE;
318
318
val &= ~(u32)AFE_I2S_CON_FROM_IO_MUX;//from consys
319
319
}
···
523
523
bool i2s_in_slave =
524
524
(substream->stream == SNDRV_PCM_STREAM_CAPTURE) &&
525
525
((be->fmt_mode & SND_SOC_DAIFMT_MASTER_MASK) ==
526
-
SND_SOC_DAIFMT_CBM_CFM);
526
+
SND_SOC_DAIFMT_CBP_CFP);
527
527
528
528
mt8365_afe_enable_main_clk(afe);
529
529
···
551
551
bool i2s_in_slave =
552
552
(substream->stream == SNDRV_PCM_STREAM_CAPTURE) &&
553
553
((be->fmt_mode & SND_SOC_DAIFMT_MASTER_MASK) ==
554
-
SND_SOC_DAIFMT_CBM_CFM);
554
+
SND_SOC_DAIFMT_CBP_CFP);
555
555
556
556
if (be->prepared[substream->stream]) {
557
557
if (reset_i2s_out_change)
···
613
613
614
614
if (apply_i2s_in_change) {
615
615
if ((be->fmt_mode & SND_SOC_DAIFMT_MASTER_MASK)
616
-
== SND_SOC_DAIFMT_CBM_CFM) {
616
+
== SND_SOC_DAIFMT_CBP_CFP) {
617
617
ret = mt8365_afe_set_2nd_i2s_asrc(afe, 32000, rate,
618
618
(unsigned int)bit_width,
619
619
0, 0, 1);
···
659
659
mt8365_dai_set_enable(afe, i2s_data, true, true);
660
660
661
661
if ((be->fmt_mode & SND_SOC_DAIFMT_MASTER_MASK)
662
-
== SND_SOC_DAIFMT_CBM_CFM)
662
+
== SND_SOC_DAIFMT_CBP_CFP)
663
663
mt8365_afe_set_2nd_i2s_asrc_enable(afe, true);
664
664
665
665
be->prepared[SNDRV_PCM_STREAM_CAPTURE] = true;
···
712
712
713
713
be->fmt_mode |= (fmt & SND_SOC_DAIFMT_INV_MASK);
714
714
715
-
if (((fmt & SND_SOC_DAIFMT_MASTER_MASK) == SND_SOC_DAIFMT_CBM_CFM))
715
+
if (((fmt & SND_SOC_DAIFMT_MASTER_MASK) == SND_SOC_DAIFMT_CBP_CFP))
716
716
be->fmt_mode |= (fmt & SND_SOC_DAIFMT_MASTER_MASK);
717
717
718
718
return 0;
+2
-2
sound/soc/mediatek/mt8365/mt8365-dai-pcm.c
+2
-2
sound/soc/mediatek/mt8365/mt8365-dai-pcm.c
···
189
189
}
190
190
191
191
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
192
-
case SND_SOC_DAIFMT_CBM_CFM:
192
+
case SND_SOC_DAIFMT_CBP_CFP:
193
193
pcm_priv->slave_mode = true;
194
194
break;
195
-
case SND_SOC_DAIFMT_CBS_CFS:
195
+
case SND_SOC_DAIFMT_CBC_CFC:
196
196
pcm_priv->slave_mode = false;
197
197
break;
198
198
default:
+1
-1
sound/soc/mediatek/mt8365/mt8365-mt6357.c
+1
-1
sound/soc/mediatek/mt8365/mt8365-mt6357.c
+2
-2
sound/soc/meson/meson-card-utils.c
+2
-2
sound/soc/meson/meson-card-utils.c
···
119
119
/* If no master is provided, default to cpu master */
120
120
if (!bitclkmaster || bitclkmaster == cpu_node) {
121
121
daifmt |= (!framemaster || framemaster == cpu_node) ?
122
-
SND_SOC_DAIFMT_CBS_CFS : SND_SOC_DAIFMT_CBS_CFM;
122
+
SND_SOC_DAIFMT_CBC_CFC : SND_SOC_DAIFMT_CBC_CFP;
123
123
} else {
124
124
daifmt |= (!framemaster || framemaster == cpu_node) ?
125
-
SND_SOC_DAIFMT_CBM_CFS : SND_SOC_DAIFMT_CBM_CFM;
125
+
SND_SOC_DAIFMT_CBP_CFC : SND_SOC_DAIFMT_CBP_CFP;
126
126
}
127
127
128
128
of_node_put(bitclkmaster);
+2
-2
sound/soc/meson/t9015.c
+2
-2
sound/soc/meson/t9015.c
+1
-1
sound/soc/mxs/mxs-sgtl5000.c
+1
-1
sound/soc/mxs/mxs-sgtl5000.c
+1
-1
sound/soc/pxa/spitz.c
+1
-1
sound/soc/pxa/spitz.c
+1
-1
sound/soc/qcom/sc7180.c
+1
-1
sound/soc/qcom/sc7180.c
+2
-2
sound/soc/qcom/sc7280.c
+2
-2
sound/soc/qcom/sc7280.c
···
342
342
343
343
static int sc7280_snd_startup(struct snd_pcm_substream *substream)
344
344
{
345
-
unsigned int fmt = SND_SOC_DAIFMT_CBS_CFS;
346
-
unsigned int codec_dai_fmt = SND_SOC_DAIFMT_CBS_CFS;
345
+
unsigned int fmt = SND_SOC_DAIFMT_CBC_CFC;
346
+
unsigned int codec_dai_fmt = SND_SOC_DAIFMT_CBC_CFC;
347
347
struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
348
348
struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);
349
349
struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);
+1
-1
sound/soc/rockchip/rk3288_hdmi_analog.c
+1
-1
sound/soc/rockchip/rk3288_hdmi_analog.c
+5
-5
sound/soc/rockchip/rk3399_gru_sound.c
+5
-5
sound/soc/rockchip/rk3399_gru_sound.c
···
338
338
.stream_name = "DP PCM",
339
339
.init = rockchip_sound_cdndp_init,
340
340
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
341
-
SND_SOC_DAIFMT_CBS_CFS,
341
+
SND_SOC_DAIFMT_CBC_CFC,
342
342
SND_SOC_DAILINK_REG(cdndp),
343
343
},
344
344
[DAILINK_DA7219] = {
···
348
348
.ops = &rockchip_sound_da7219_ops,
349
349
/* set da7219 as slave */
350
350
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
351
-
SND_SOC_DAIFMT_CBS_CFS,
351
+
SND_SOC_DAIFMT_CBC_CFC,
352
352
SND_SOC_DAILINK_REG(da7219),
353
353
},
354
354
[DAILINK_DMIC] = {
···
356
356
.stream_name = "DMIC PCM",
357
357
.ops = &rockchip_sound_dmic_ops,
358
358
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
359
-
SND_SOC_DAIFMT_CBS_CFS,
359
+
SND_SOC_DAIFMT_CBC_CFC,
360
360
SND_SOC_DAILINK_REG(dmic),
361
361
},
362
362
[DAILINK_MAX98357A] = {
···
365
365
.ops = &rockchip_sound_max98357a_ops,
366
366
/* set max98357a as slave */
367
367
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
368
-
SND_SOC_DAIFMT_CBS_CFS,
368
+
SND_SOC_DAIFMT_CBC_CFC,
369
369
SND_SOC_DAILINK_REG(max98357a),
370
370
},
371
371
[DAILINK_RT5514] = {
···
374
374
.ops = &rockchip_sound_rt5514_ops,
375
375
/* set rt5514 as slave */
376
376
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
377
-
SND_SOC_DAIFMT_CBS_CFS,
377
+
SND_SOC_DAIFMT_CBC_CFC,
378
378
SND_SOC_DAILINK_REG(rt5514),
379
379
},
380
380
/* RT5514 DSP for voice wakeup via spi bus */
+4
-4
sound/soc/rockchip/rockchip_max98090.c
+4
-4
sound/soc/rockchip/rockchip_max98090.c
···
247
247
.ops = &rk_aif1_ops,
248
248
/* set max98090 as slave */
249
249
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
250
-
SND_SOC_DAIFMT_CBS_CFS,
250
+
SND_SOC_DAIFMT_CBC_CFC,
251
251
SND_SOC_DAILINK_REG(analog),
252
252
},
253
253
};
···
260
260
.init = rk_hdmi_init,
261
261
.ops = &rk_aif1_ops,
262
262
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
263
-
SND_SOC_DAIFMT_CBS_CFS,
263
+
SND_SOC_DAIFMT_CBC_CFC,
264
264
SND_SOC_DAILINK_REG(hdmi),
265
265
}
266
266
};
···
274
274
.ops = &rk_aif1_ops,
275
275
/* set max98090 as slave */
276
276
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
277
-
SND_SOC_DAIFMT_CBS_CFS,
277
+
SND_SOC_DAIFMT_CBC_CFC,
278
278
SND_SOC_DAILINK_REG(analog),
279
279
},
280
280
[DAILINK_HDMI] = {
···
283
283
.init = rk_hdmi_init,
284
284
.ops = &rk_aif1_ops,
285
285
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
286
-
SND_SOC_DAIFMT_CBS_CFS,
286
+
SND_SOC_DAIFMT_CBC_CFC,
287
287
SND_SOC_DAILINK_REG(hdmi),
288
288
}
289
289
};
+1
-1
sound/soc/rockchip/rockchip_rt5645.c
+1
-1
sound/soc/rockchip/rockchip_rt5645.c
+3
-3
sound/soc/samsung/aries_wm8994.c
+3
-3
sound/soc/samsung/aries_wm8994.c
···
474
474
.name = "WM8994 AIF1",
475
475
.stream_name = "HiFi",
476
476
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
477
-
SND_SOC_DAIFMT_CBM_CFM,
477
+
SND_SOC_DAIFMT_CBP_CFP,
478
478
.ops = &aries_ops,
479
479
SND_SOC_DAILINK_REG(aif1),
480
480
},
···
510
510
};
511
511
512
512
static const struct aries_wm8994_variant fascinate4g_variant = {
513
-
.modem_dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_CBS_CFS
513
+
.modem_dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_CBC_CFC
514
514
| SND_SOC_DAIFMT_IB_NF,
515
515
.has_fm_radio = false,
516
516
};
517
517
518
518
static const struct aries_wm8994_variant aries_variant = {
519
-
.modem_dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_CBM_CFM
519
+
.modem_dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_CBP_CFP
520
520
| SND_SOC_DAIFMT_IB_NF,
521
521
.has_fm_radio = true,
522
522
};
+2
-2
sound/soc/samsung/arndale.c
+2
-2
sound/soc/samsung/arndale.c
···
95
95
.stream_name = "Primary",
96
96
.dai_fmt = SND_SOC_DAIFMT_I2S
97
97
| SND_SOC_DAIFMT_NB_NF
98
-
| SND_SOC_DAIFMT_CBS_CFS,
98
+
| SND_SOC_DAIFMT_CBC_CFC,
99
99
.ops = &arndale_rt5631_ops,
100
100
SND_SOC_DAILINK_REG(rt5631_hifi),
101
101
},
···
112
112
.stream_name = "Primary",
113
113
.dai_fmt = SND_SOC_DAIFMT_I2S
114
114
| SND_SOC_DAIFMT_NB_NF
115
-
| SND_SOC_DAIFMT_CBM_CFM,
115
+
| SND_SOC_DAIFMT_CBP_CFP,
116
116
.ops = &arndale_wm1811_ops,
117
117
SND_SOC_DAILINK_REG(wm1811_hifi),
118
118
},
+10
-10
sound/soc/samsung/bells.c
+10
-10
sound/soc/samsung/bells.c
···
256
256
.name = "CPU-DSP",
257
257
.stream_name = "CPU-DSP",
258
258
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
259
-
| SND_SOC_DAIFMT_CBM_CFM,
259
+
| SND_SOC_DAIFMT_CBP_CFP,
260
260
SND_SOC_DAILINK_REG(wm2200_cpu_dsp),
261
261
},
262
262
{
263
263
.name = "DSP-CODEC",
264
264
.stream_name = "DSP-CODEC",
265
265
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
266
-
| SND_SOC_DAIFMT_CBM_CFM,
266
+
| SND_SOC_DAIFMT_CBP_CFP,
267
267
.c2c_params = &sub_params,
268
268
.num_c2c_params = 1,
269
269
.ignore_suspend = 1,
···
293
293
.name = "CPU-DSP",
294
294
.stream_name = "CPU-DSP",
295
295
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
296
-
| SND_SOC_DAIFMT_CBM_CFM,
296
+
| SND_SOC_DAIFMT_CBP_CFP,
297
297
SND_SOC_DAILINK_REG(wm5102_cpu_dsp),
298
298
},
299
299
{
300
300
.name = "DSP-CODEC",
301
301
.stream_name = "DSP-CODEC",
302
302
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
303
-
| SND_SOC_DAIFMT_CBM_CFM,
303
+
| SND_SOC_DAIFMT_CBP_CFP,
304
304
.c2c_params = &sub_params,
305
305
.num_c2c_params = 1,
306
306
.ignore_suspend = 1,
···
310
310
.name = "Baseband",
311
311
.stream_name = "Baseband",
312
312
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
313
-
| SND_SOC_DAIFMT_CBM_CFM,
313
+
| SND_SOC_DAIFMT_CBP_CFP,
314
314
.ignore_suspend = 1,
315
315
.c2c_params = &baseband_params,
316
316
.num_c2c_params = 1,
···
320
320
.name = "Sub",
321
321
.stream_name = "Sub",
322
322
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
323
-
| SND_SOC_DAIFMT_CBS_CFS,
323
+
| SND_SOC_DAIFMT_CBC_CFC,
324
324
.ignore_suspend = 1,
325
325
.c2c_params = &sub_params,
326
326
.num_c2c_params = 1,
···
351
351
.name = "CPU-DSP",
352
352
.stream_name = "CPU-DSP",
353
353
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
354
-
| SND_SOC_DAIFMT_CBM_CFM,
354
+
| SND_SOC_DAIFMT_CBP_CFP,
355
355
SND_SOC_DAILINK_REG(wm5110_cpu_dsp),
356
356
},
357
357
{
358
358
.name = "DSP-CODEC",
359
359
.stream_name = "DSP-CODEC",
360
360
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
361
-
| SND_SOC_DAIFMT_CBM_CFM,
361
+
| SND_SOC_DAIFMT_CBP_CFP,
362
362
.c2c_params = &sub_params,
363
363
.num_c2c_params = 1,
364
364
.ignore_suspend = 1,
···
368
368
.name = "Baseband",
369
369
.stream_name = "Baseband",
370
370
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
371
-
| SND_SOC_DAIFMT_CBM_CFM,
371
+
| SND_SOC_DAIFMT_CBP_CFP,
372
372
.ignore_suspend = 1,
373
373
.c2c_params = &baseband_params,
374
374
.num_c2c_params = 1,
···
378
378
.name = "Sub",
379
379
.stream_name = "Sub",
380
380
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
381
-
| SND_SOC_DAIFMT_CBS_CFS,
381
+
| SND_SOC_DAIFMT_CBC_CFC,
382
382
.ignore_suspend = 1,
383
383
.c2c_params = &sub_params,
384
384
.num_c2c_params = 1,
+2
-2
sound/soc/samsung/littlemill.c
+2
-2
sound/soc/samsung/littlemill.c
···
157
157
.name = "CPU",
158
158
.stream_name = "CPU",
159
159
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
160
-
| SND_SOC_DAIFMT_CBM_CFM,
160
+
| SND_SOC_DAIFMT_CBP_CFP,
161
161
.ops = &littlemill_ops,
162
162
SND_SOC_DAILINK_REG(cpu),
163
163
},
···
165
165
.name = "Baseband",
166
166
.stream_name = "Baseband",
167
167
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
168
-
| SND_SOC_DAIFMT_CBM_CFM,
168
+
| SND_SOC_DAIFMT_CBP_CFP,
169
169
.ignore_suspend = 1,
170
170
.c2c_params = &baseband_params,
171
171
.num_c2c_params = 1,
+3
-3
sound/soc/samsung/lowland.c
+3
-3
sound/soc/samsung/lowland.c
···
105
105
.name = "CPU",
106
106
.stream_name = "CPU",
107
107
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
108
-
SND_SOC_DAIFMT_CBM_CFM,
108
+
SND_SOC_DAIFMT_CBP_CFP,
109
109
.init = lowland_wm5100_init,
110
110
SND_SOC_DAILINK_REG(cpu),
111
111
},
···
113
113
.name = "Baseband",
114
114
.stream_name = "Baseband",
115
115
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
116
-
SND_SOC_DAIFMT_CBM_CFM,
116
+
SND_SOC_DAIFMT_CBP_CFP,
117
117
.ignore_suspend = 1,
118
118
SND_SOC_DAILINK_REG(baseband),
119
119
},
···
121
121
.name = "Sub Speaker",
122
122
.stream_name = "Sub Speaker",
123
123
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
124
-
SND_SOC_DAIFMT_CBM_CFM,
124
+
SND_SOC_DAIFMT_CBP_CFP,
125
125
.ignore_suspend = 1,
126
126
.c2c_params = &sub_params,
127
127
.num_c2c_params = 1,
+1
-1
sound/soc/samsung/midas_wm1811.c
+1
-1
sound/soc/samsung/midas_wm1811.c
+1
-1
sound/soc/samsung/odroid.c
+1
-1
sound/soc/samsung/odroid.c
+2
-2
sound/soc/samsung/smdk_wm8994.c
+2
-2
sound/soc/samsung/smdk_wm8994.c
···
106
106
.stream_name = "Pri_Dai",
107
107
.init = smdk_wm8994_init_paiftx,
108
108
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
109
-
SND_SOC_DAIFMT_CBM_CFM,
109
+
SND_SOC_DAIFMT_CBP_CFP,
110
110
.ops = &smdk_ops,
111
111
SND_SOC_DAILINK_REG(aif1),
112
112
}, { /* Sec_Fifo Playback i/f */
113
113
.name = "Sec_FIFO TX",
114
114
.stream_name = "Sec_Dai",
115
115
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
116
-
SND_SOC_DAIFMT_CBM_CFM,
116
+
SND_SOC_DAIFMT_CBP_CFP,
117
117
.ops = &smdk_ops,
118
118
SND_SOC_DAILINK_REG(fifo_tx),
119
119
},
+1
-1
sound/soc/samsung/smdk_wm8994pcm.c
+1
-1
sound/soc/samsung/smdk_wm8994pcm.c
+1
-1
sound/soc/samsung/snow.c
+1
-1
sound/soc/samsung/snow.c
+3
-3
sound/soc/samsung/speyside.c
+3
-3
sound/soc/samsung/speyside.c
···
210
210
.stream_name = "CPU-DSP",
211
211
.init = speyside_wm0010_init,
212
212
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
213
-
| SND_SOC_DAIFMT_CBM_CFM,
213
+
| SND_SOC_DAIFMT_CBP_CFP,
214
214
SND_SOC_DAILINK_REG(cpu_dsp),
215
215
},
216
216
{
···
218
218
.stream_name = "DSP-CODEC",
219
219
.init = speyside_wm8996_init,
220
220
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
221
-
| SND_SOC_DAIFMT_CBM_CFM,
221
+
| SND_SOC_DAIFMT_CBP_CFP,
222
222
.c2c_params = &dsp_codec_params,
223
223
.num_c2c_params = 1,
224
224
.ignore_suspend = 1,
···
228
228
.name = "Baseband",
229
229
.stream_name = "Baseband",
230
230
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
231
-
| SND_SOC_DAIFMT_CBM_CFM,
231
+
| SND_SOC_DAIFMT_CBP_CFP,
232
232
.ignore_suspend = 1,
233
233
SND_SOC_DAILINK_REG(baseband),
234
234
},
+4
-4
sound/soc/samsung/tm2_wm5110.c
+4
-4
sound/soc/samsung/tm2_wm5110.c
···
451
451
.stream_name = "HiFi Primary",
452
452
.ops = &tm2_aif1_ops,
453
453
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
454
-
SND_SOC_DAIFMT_CBM_CFM,
454
+
SND_SOC_DAIFMT_CBP_CFP,
455
455
SND_SOC_DAILINK_REG(aif1),
456
456
}, {
457
457
.name = "WM5110 Voice",
458
458
.stream_name = "Voice call",
459
459
.ops = &tm2_aif2_ops,
460
460
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
461
-
SND_SOC_DAIFMT_CBM_CFM,
461
+
SND_SOC_DAIFMT_CBP_CFP,
462
462
.ignore_suspend = 1,
463
463
SND_SOC_DAILINK_REG(voice),
464
464
}, {
465
465
.name = "WM5110 BT",
466
466
.stream_name = "Bluetooth",
467
467
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
468
-
SND_SOC_DAIFMT_CBM_CFM,
468
+
SND_SOC_DAIFMT_CBP_CFP,
469
469
.ignore_suspend = 1,
470
470
SND_SOC_DAILINK_REG(bt),
471
471
}, {
···
473
473
.stream_name = "i2s1",
474
474
.ops = &tm2_hdmi_ops,
475
475
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
476
-
SND_SOC_DAIFMT_CBS_CFS,
476
+
SND_SOC_DAIFMT_CBC_CFC,
477
477
SND_SOC_DAILINK_REG(hdmi),
478
478
}
479
479
};
+1
-1
sound/soc/samsung/tobermory.c
+1
-1
sound/soc/samsung/tobermory.c
+9
-9
sound/soc/tegra/tegra_asoc_machine.c
+9
-9
sound/soc/tegra/tegra_asoc_machine.c
···
637
637
.stream_name = "WM8753 PCM",
638
638
.dai_fmt = SND_SOC_DAIFMT_I2S |
639
639
SND_SOC_DAIFMT_NB_NF |
640
-
SND_SOC_DAIFMT_CBS_CFS,
640
+
SND_SOC_DAIFMT_CBC_CFC,
641
641
SND_SOC_DAILINK_REG(wm8753_hifi),
642
642
};
643
643
···
701
701
.init = tegra_asoc_machine_init,
702
702
.dai_fmt = SND_SOC_DAIFMT_I2S |
703
703
SND_SOC_DAIFMT_NB_NF |
704
-
SND_SOC_DAIFMT_CBS_CFS,
704
+
SND_SOC_DAIFMT_CBC_CFC,
705
705
SND_SOC_DAILINK_REG(max98090_hifi),
706
706
};
707
707
···
736
736
.init = tegra_asoc_machine_init,
737
737
.dai_fmt = SND_SOC_DAIFMT_I2S |
738
738
SND_SOC_DAIFMT_NB_NF |
739
-
SND_SOC_DAIFMT_CBS_CFS,
739
+
SND_SOC_DAIFMT_CBC_CFC,
740
740
SND_SOC_DAILINK_REG(max98088_hifi),
741
741
};
742
742
···
769
769
.stream_name = "HiFi",
770
770
.dai_fmt = SND_SOC_DAIFMT_I2S |
771
771
SND_SOC_DAIFMT_NB_NF |
772
-
SND_SOC_DAIFMT_CBS_CFS,
772
+
SND_SOC_DAIFMT_CBC_CFC,
773
773
SND_SOC_DAILINK_REG(sgtl5000_hifi),
774
774
};
775
775
···
812
812
.stream_name = "AIC23",
813
813
.dai_fmt = SND_SOC_DAIFMT_I2S |
814
814
SND_SOC_DAIFMT_NB_NF |
815
-
SND_SOC_DAIFMT_CBS_CFS,
815
+
SND_SOC_DAIFMT_CBC_CFC,
816
816
SND_SOC_DAILINK_REG(tlv320aic23_hifi),
817
817
};
818
818
···
861
861
.init = tegra_rt5677_init,
862
862
.dai_fmt = SND_SOC_DAIFMT_I2S |
863
863
SND_SOC_DAIFMT_NB_NF |
864
-
SND_SOC_DAIFMT_CBS_CFS,
864
+
SND_SOC_DAIFMT_CBC_CFC,
865
865
SND_SOC_DAILINK_REG(rt5677_aif1),
866
866
};
867
867
···
895
895
.init = tegra_asoc_machine_init,
896
896
.dai_fmt = SND_SOC_DAIFMT_I2S |
897
897
SND_SOC_DAIFMT_NB_NF |
898
-
SND_SOC_DAIFMT_CBS_CFS,
898
+
SND_SOC_DAIFMT_CBC_CFC,
899
899
SND_SOC_DAILINK_REG(rt5640_aif1),
900
900
};
901
901
···
928
928
.init = tegra_rt5677_init,
929
929
.dai_fmt = SND_SOC_DAIFMT_I2S |
930
930
SND_SOC_DAIFMT_NB_NF |
931
-
SND_SOC_DAIFMT_CBS_CFS,
931
+
SND_SOC_DAIFMT_CBC_CFC,
932
932
SND_SOC_DAILINK_REG(rt5632_hifi),
933
933
};
934
934
···
961
961
.init = tegra_asoc_machine_init,
962
962
.dai_fmt = SND_SOC_DAIFMT_I2S |
963
963
SND_SOC_DAIFMT_NB_NF |
964
-
SND_SOC_DAIFMT_CBS_CFS,
964
+
SND_SOC_DAIFMT_CBC_CFC,
965
965
SND_SOC_DAILINK_REG(rt5631_hifi),
966
966
};
967
967
+1
-1
sound/soc/tegra/tegra_wm8903.c
+1
-1
sound/soc/tegra/tegra_wm8903.c
+1
-1
sound/soc/ti/ams-delta.c
+1
-1
sound/soc/ti/ams-delta.c
+1
-1
sound/soc/ti/davinci-evm.c
+1
-1
sound/soc/ti/davinci-evm.c
+1
-1
sound/soc/ti/j721e-evm.c
+1
-1
sound/soc/ti/j721e-evm.c
+1
-1
sound/soc/ti/n810.c
+1
-1
sound/soc/ti/n810.c
+3
-3
sound/soc/ti/omap-twl4030.c
+3
-3
sound/soc/ti/omap-twl4030.c
···
42
42
case 2: /* Stereo I2S mode */
43
43
fmt = SND_SOC_DAIFMT_I2S |
44
44
SND_SOC_DAIFMT_NB_NF |
45
-
SND_SOC_DAIFMT_CBM_CFM;
45
+
SND_SOC_DAIFMT_CBP_CFP;
46
46
break;
47
47
case 4: /* Four channel TDM mode */
48
48
fmt = SND_SOC_DAIFMT_DSP_A |
49
49
SND_SOC_DAIFMT_IB_NF |
50
-
SND_SOC_DAIFMT_CBM_CFM;
50
+
SND_SOC_DAIFMT_CBP_CFP;
51
51
break;
52
52
default:
53
53
return -EINVAL;
···
218
218
.name = "TWL4030 Voice",
219
219
.stream_name = "TWL4030 Voice",
220
220
.dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF |
221
-
SND_SOC_DAIFMT_CBM_CFM,
221
+
SND_SOC_DAIFMT_CBP_CFP,
222
222
SND_SOC_DAILINK_REG(voice),
223
223
},
224
224
};
+2
-2
sound/soc/ti/omap3pandora.c
+2
-2
sound/soc/ti/omap3pandora.c
···
189
189
.name = "PCM1773",
190
190
.stream_name = "HiFi Out",
191
191
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
192
-
SND_SOC_DAIFMT_CBS_CFS,
192
+
SND_SOC_DAIFMT_CBC_CFC,
193
193
.ops = &omap3pandora_ops,
194
194
.init = omap3pandora_out_init,
195
195
SND_SOC_DAILINK_REG(out),
···
197
197
.name = "TWL4030",
198
198
.stream_name = "Line/Mic In",
199
199
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
200
-
SND_SOC_DAIFMT_CBS_CFS,
200
+
SND_SOC_DAIFMT_CBC_CFC,
201
201
.ops = &omap3pandora_ops,
202
202
.init = omap3pandora_in_init,
203
203
SND_SOC_DAILINK_REG(in),
+1
-1
sound/soc/ti/osk5912.c
+1
-1
sound/soc/ti/osk5912.c
+2
-2
sound/soc/ux500/mop500_ab8500.c
+2
-2
sound/soc/ux500/mop500_ab8500.c
···
275
275
276
276
if (driver_mode == DRIVERMODE_NORMAL) {
277
277
fmt = SND_SOC_DAIFMT_DSP_A |
278
-
SND_SOC_DAIFMT_CBM_CFM |
278
+
SND_SOC_DAIFMT_CBP_CFP |
279
279
SND_SOC_DAIFMT_NB_NF |
280
280
SND_SOC_DAIFMT_CONT;
281
281
} else {
282
282
fmt = SND_SOC_DAIFMT_DSP_A |
283
-
SND_SOC_DAIFMT_CBM_CFM |
283
+
SND_SOC_DAIFMT_CBP_CFP |
284
284
SND_SOC_DAIFMT_NB_NF |
285
285
SND_SOC_DAIFMT_GATED;
286
286
}