diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-02-05 07:08:35 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-02-05 07:08:35 +0100 |
| commit | a3ae255e3729c1bb4507412ea29be804f703d44c (patch) | |
| tree | edd1ca577dad5a0d701ae111519eaefa60896f98 /sound/soc/fsl/imx-mc13783.c | |
| parent | Merge branch 'topic/snd-device' into for-next (diff) | |
| parent | Merge remote-tracking branches 'asoc/topic/wm8960', 'asoc/topic/wm8988' and '... (diff) | |
| download | linux-a3ae255e3729c1bb4507412ea29be804f703d44c.tar.xz linux-a3ae255e3729c1bb4507412ea29be804f703d44c.zip | |
Merge tag 'asoc-v3.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.20
More updates for v3.20:
- Lots of refactoring from Lars-Peter Clausen, moving drivers to more
data driven initialization and rationalizing a lot of DAPM usage.
- Much improved handling of CDCLK clocks on Samsung I2S controllers.
- Lots of driver specific cleanups and feature improvements.
- CODEC support for TI PCM514x and TLV320AIC3104 devices.
- Board support for Tegra systems with Realtek RT5677.
Conflicts:
sound/soc/intel/sst-mfld-platform-pcm.c
Diffstat (limited to 'sound/soc/fsl/imx-mc13783.c')
| -rw-r--r-- | sound/soc/fsl/imx-mc13783.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/fsl/imx-mc13783.c b/sound/soc/fsl/imx-mc13783.c index 6bf5bce01a92..9e6493d4e7ff 100644 --- a/sound/soc/fsl/imx-mc13783.c +++ b/sound/soc/fsl/imx-mc13783.c @@ -37,8 +37,7 @@ static int imx_mc13783_hifi_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *codec_dai = rtd->codec_dai; int ret; - ret = snd_soc_dai_set_tdm_slot(codec_dai, 0xfffffffc, 0xfffffffc, - 4, 16); + ret = snd_soc_dai_set_tdm_slot(codec_dai, 0x3, 0x3, 4, 16); if (ret) return ret; @@ -46,7 +45,7 @@ static int imx_mc13783_hifi_hw_params(struct snd_pcm_substream *substream, if (ret) return ret; - ret = snd_soc_dai_set_tdm_slot(cpu_dai, 0x0, 0xfffffffc, 2, 16); + ret = snd_soc_dai_set_tdm_slot(cpu_dai, 0x3, 0x3, 2, 16); if (ret) return ret; |