Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ASoC: Fix CODEC DAI names for Goni
ASoC: Fix CODEC name in Goni
davinci-mcasp: fix _CBM_CFS pin directions
davinci-mcasp: fix _CBM_CFS hw_params
davinci-mcasp: use bitfield definitions for PDIR
ASoC: davinci-mcasp: correct tdm_slots limit
+16
-11
+12
-7
sound/soc/davinci/davinci-mcasp.c
+12
-7
sound/soc/davinci/davinci-mcasp.c
···
434
434
mcasp_set_bits(base + DAVINCI_MCASP_ACLKRCTL_REG, ACLKRE);
435
435
mcasp_set_bits(base + DAVINCI_MCASP_RXFMCTL_REG, AFSRE);
436
436
437
-
mcasp_set_bits(base + DAVINCI_MCASP_PDIR_REG, (0x7 << 26));
437
+
mcasp_set_bits(base + DAVINCI_MCASP_PDIR_REG,
438
+
ACLKX | AHCLKX | AFSX);
438
439
break;
439
440
case SND_SOC_DAIFMT_CBM_CFS:
440
441
/* codec is clock master and frame slave */
441
-
mcasp_set_bits(base + DAVINCI_MCASP_ACLKXCTL_REG, ACLKXE);
442
+
mcasp_clr_bits(base + DAVINCI_MCASP_ACLKXCTL_REG, ACLKXE);
442
443
mcasp_set_bits(base + DAVINCI_MCASP_TXFMCTL_REG, AFSXE);
443
444
444
-
mcasp_set_bits(base + DAVINCI_MCASP_ACLKRCTL_REG, ACLKRE);
445
+
mcasp_clr_bits(base + DAVINCI_MCASP_ACLKRCTL_REG, ACLKRE);
445
446
mcasp_set_bits(base + DAVINCI_MCASP_RXFMCTL_REG, AFSRE);
446
447
447
-
mcasp_set_bits(base + DAVINCI_MCASP_PDIR_REG, (0x2d << 26));
448
+
mcasp_clr_bits(base + DAVINCI_MCASP_PDIR_REG,
449
+
ACLKX | ACLKR);
450
+
mcasp_set_bits(base + DAVINCI_MCASP_PDIR_REG,
451
+
AFSX | AFSR);
448
452
break;
449
453
case SND_SOC_DAIFMT_CBM_CFM:
450
454
/* codec is clock and frame master */
···
458
454
mcasp_clr_bits(base + DAVINCI_MCASP_ACLKRCTL_REG, ACLKRE);
459
455
mcasp_clr_bits(base + DAVINCI_MCASP_RXFMCTL_REG, AFSRE);
460
456
461
-
mcasp_clr_bits(base + DAVINCI_MCASP_PDIR_REG, (0x3f << 26));
457
+
mcasp_clr_bits(base + DAVINCI_MCASP_PDIR_REG,
458
+
ACLKX | AHCLKX | AFSX | ACLKR | AHCLKR | AFSR);
462
459
break;
463
460
464
461
default:
···
649
644
mcasp_set_reg(dev->base + DAVINCI_MCASP_TXTDM_REG, mask);
650
645
mcasp_set_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, TXORD);
651
646
652
-
if ((dev->tdm_slots >= 2) || (dev->tdm_slots <= 32))
647
+
if ((dev->tdm_slots >= 2) && (dev->tdm_slots <= 32))
653
648
mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMCTL_REG,
654
649
FSXMOD(dev->tdm_slots), FSXMOD(0x1FF));
655
650
else
···
665
660
AHCLKRE);
666
661
mcasp_set_reg(dev->base + DAVINCI_MCASP_RXTDM_REG, mask);
667
662
668
-
if ((dev->tdm_slots >= 2) || (dev->tdm_slots <= 32))
663
+
if ((dev->tdm_slots >= 2) && (dev->tdm_slots <= 32))
669
664
mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMCTL_REG,
670
665
FSRMOD(dev->tdm_slots), FSRMOD(0x1FF));
671
666
else
+4
-4
sound/soc/samsung/goni_wm8994.c
+4
-4
sound/soc/samsung/goni_wm8994.c
···
236
236
.name = "WM8994",
237
237
.stream_name = "WM8994 HiFi",
238
238
.cpu_dai_name = "samsung-i2s.0",
239
-
.codec_dai_name = "wm8994-hifi",
239
+
.codec_dai_name = "wm8994-aif1",
240
240
.platform_name = "samsung-audio",
241
-
.codec_name = "wm8994-codec.0-0x1a",
241
+
.codec_name = "wm8994-codec.0-001a",
242
242
.init = goni_wm8994_init,
243
243
.ops = &goni_hifi_ops,
244
244
}, {
245
245
.name = "WM8994 Voice",
246
246
.stream_name = "Voice",
247
247
.cpu_dai_name = "goni-voice-dai",
248
-
.codec_dai_name = "wm8994-voice",
248
+
.codec_dai_name = "wm8994-aif2",
249
249
.platform_name = "samsung-audio",
250
-
.codec_name = "wm8994-codec.0-0x1a",
250
+
.codec_name = "wm8994-codec.0-001a",
251
251
.ops = &goni_voice_ops,
252
252
},
253
253
};