]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
ASoC: fsl: p1022ds: tell the WM8776 codec driver that it's the master
authorTimur Tabi <timur@freescale.com>
Fri, 16 Mar 2012 21:32:52 +0000 (16:32 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 2 Apr 2012 17:31:54 +0000 (10:31 -0700)
commite7e9f000debc0128d1bc91b3a08e3f9013187d7a
tree99ead4ddd0e7494e6adde5e67dabc5d2a64dd86b
parenta3d921898eac98a977061da4ab364e518d85dd8a
ASoC: fsl: p1022ds: tell the WM8776 codec driver that it's the master

commit 70ac07bb633dee75ac554195b9a4d69adfa7803c upstream.

The WM8776 codec driver requires the machine driver to set one of the
SND_SOC_DAIFMT_CBx_xxx values.  The P1022DS machine driver should be setting
SND_SOC_DAIFMT_CBM_CFM, but since that value was zero, no one noticed.

Commit 75d9ac46 ("ASoC: Allow DAI formats to be specified in the
dai_link"), however, changed the value of SND_SOC_DAIFMT_CBM_CFM from zero
to a non-zero value, which means that it now needs to be specifically set
by the machine driver.

We also set SND_SOC_DAIFMT_NB_NF, for the same reason.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/fsl/p1022_ds.c