ASoC: Use supplied DAI for WM9713 rather than substream
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
4f904735c8
commit
55b8bac50a
|
@ -931,9 +931,7 @@ static int wm9713_pcm_hw_params(struct snd_pcm_substream *substream,
|
||||||
struct snd_pcm_hw_params *params,
|
struct snd_pcm_hw_params *params,
|
||||||
struct snd_soc_dai *dai)
|
struct snd_soc_dai *dai)
|
||||||
{
|
{
|
||||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
struct snd_soc_codec *codec = dai->codec;
|
||||||
struct snd_soc_device *socdev = rtd->socdev;
|
|
||||||
struct snd_soc_codec *codec = socdev->codec;
|
|
||||||
u16 reg = ac97_read(codec, AC97_CENTER_LFE_MASTER) & 0xfff3;
|
u16 reg = ac97_read(codec, AC97_CENTER_LFE_MASTER) & 0xfff3;
|
||||||
|
|
||||||
switch (params_format(params)) {
|
switch (params_format(params)) {
|
||||||
|
@ -958,9 +956,7 @@ static int wm9713_pcm_hw_params(struct snd_pcm_substream *substream,
|
||||||
static void wm9713_voiceshutdown(struct snd_pcm_substream *substream,
|
static void wm9713_voiceshutdown(struct snd_pcm_substream *substream,
|
||||||
struct snd_soc_dai *dai)
|
struct snd_soc_dai *dai)
|
||||||
{
|
{
|
||||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
struct snd_soc_codec *codec = dai->codec;
|
||||||
struct snd_soc_device *socdev = rtd->socdev;
|
|
||||||
struct snd_soc_codec *codec = socdev->codec;
|
|
||||||
u16 status;
|
u16 status;
|
||||||
|
|
||||||
/* Gracefully shut down the voice interface. */
|
/* Gracefully shut down the voice interface. */
|
||||||
|
@ -974,10 +970,8 @@ static void wm9713_voiceshutdown(struct snd_pcm_substream *substream,
|
||||||
static int ac97_hifi_prepare(struct snd_pcm_substream *substream,
|
static int ac97_hifi_prepare(struct snd_pcm_substream *substream,
|
||||||
struct snd_soc_dai *dai)
|
struct snd_soc_dai *dai)
|
||||||
{
|
{
|
||||||
|
struct snd_soc_codec *codec = dai->codec;
|
||||||
struct snd_pcm_runtime *runtime = substream->runtime;
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
|
||||||
struct snd_soc_device *socdev = rtd->socdev;
|
|
||||||
struct snd_soc_codec *codec = socdev->codec;
|
|
||||||
int reg;
|
int reg;
|
||||||
u16 vra;
|
u16 vra;
|
||||||
|
|
||||||
|
@ -995,10 +989,8 @@ static int ac97_hifi_prepare(struct snd_pcm_substream *substream,
|
||||||
static int ac97_aux_prepare(struct snd_pcm_substream *substream,
|
static int ac97_aux_prepare(struct snd_pcm_substream *substream,
|
||||||
struct snd_soc_dai *dai)
|
struct snd_soc_dai *dai)
|
||||||
{
|
{
|
||||||
|
struct snd_soc_codec *codec = dai->codec;
|
||||||
struct snd_pcm_runtime *runtime = substream->runtime;
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
|
||||||
struct snd_soc_device *socdev = rtd->socdev;
|
|
||||||
struct snd_soc_codec *codec = socdev->codec;
|
|
||||||
u16 vra, xsle;
|
u16 vra, xsle;
|
||||||
|
|
||||||
vra = ac97_read(codec, AC97_EXTENDED_STATUS);
|
vra = ac97_read(codec, AC97_EXTENDED_STATUS);
|
||||||
|
|
Loading…
Reference in New Issue