Merge remote-tracking branch 'asoc/topic/wm8727' into asoc-next

This commit is contained in:
Mark Brown 2013-08-22 14:28:58 +01:00
commit ab4f0935a8

View File

@ -23,6 +23,16 @@
#include <sound/initval.h>
#include <sound/soc.h>
static const struct snd_soc_dapm_widget wm8727_dapm_widgets[] = {
SND_SOC_DAPM_OUTPUT("VOUTL"),
SND_SOC_DAPM_OUTPUT("VOUTR"),
};
static const struct snd_soc_dapm_route wm8727_dapm_routes[] = {
{ "VOUTL", NULL, "Playback" },
{ "VOUTR", NULL, "Playback" },
};
/*
* Note this is a simple chip with no configuration interface, sample rate is
* determined automatically by examining the Master clock and Bit clock ratios
@ -43,7 +53,12 @@ static struct snd_soc_dai_driver wm8727_dai = {
},
};
static struct snd_soc_codec_driver soc_codec_dev_wm8727;
static struct snd_soc_codec_driver soc_codec_dev_wm8727 = {
.dapm_widgets = wm8727_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(wm8727_dapm_widgets),
.dapm_routes = wm8727_dapm_routes,
.num_dapm_routes = ARRAY_SIZE(wm8727_dapm_routes),
};
static int wm8727_probe(struct platform_device *pdev)
{