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

This commit is contained in:
Mark Brown 2013-08-22 14:29:00 +01:00
Родитель a2e4b255c0 226059e1cd
Коммит 1179ace13e
1 изменённых файлов: 16 добавлений и 1 удалений

Просмотреть файл

@ -26,6 +26,16 @@
#include <sound/initval.h>
#include <sound/soc.h>
static const struct snd_soc_dapm_widget wm8782_dapm_widgets[] = {
SND_SOC_DAPM_INPUT("AINL"),
SND_SOC_DAPM_INPUT("AINR"),
};
static const struct snd_soc_dapm_route wm8782_dapm_routes[] = {
{ "Capture", NULL, "AINL" },
{ "Capture", NULL, "AINR" },
};
static struct snd_soc_dai_driver wm8782_dai = {
.name = "wm8782",
.capture = {
@ -40,7 +50,12 @@ static struct snd_soc_dai_driver wm8782_dai = {
},
};
static struct snd_soc_codec_driver soc_codec_dev_wm8782;
static struct snd_soc_codec_driver soc_codec_dev_wm8782 = {
.dapm_widgets = wm8782_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(wm8782_dapm_widgets),
.dapm_routes = wm8782_dapm_routes,
.num_dapm_routes = ARRAY_SIZE(wm8782_dapm_routes),
};
static int wm8782_probe(struct platform_device *pdev)
{