mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
Merge remote-tracking branch 'asoc/topic/ad73311' into asoc-next
This commit is contained in:
commit
042c325a5a
2 changed files with 22 additions and 1 deletions
|
@ -595,6 +595,7 @@ S: Supported
|
|||
F: sound/soc/codecs/adau*
|
||||
F: sound/soc/codecs/adav*
|
||||
F: sound/soc/codecs/ad1*
|
||||
F: sound/soc/codecs/ad7*
|
||||
F: sound/soc/codecs/ssm*
|
||||
F: sound/soc/codecs/sigmadsp.*
|
||||
|
||||
|
|
|
@ -23,6 +23,21 @@
|
|||
|
||||
#include "ad73311.h"
|
||||
|
||||
static const struct snd_soc_dapm_widget ad73311_dapm_widgets[] = {
|
||||
SND_SOC_DAPM_INPUT("VINP"),
|
||||
SND_SOC_DAPM_INPUT("VINN"),
|
||||
SND_SOC_DAPM_OUTPUT("VOUTN"),
|
||||
SND_SOC_DAPM_OUTPUT("VOUTP"),
|
||||
};
|
||||
|
||||
static const struct snd_soc_dapm_route ad73311_dapm_routes[] = {
|
||||
{ "Capture", NULL, "VINP" },
|
||||
{ "Capture", NULL, "VINN" },
|
||||
|
||||
{ "VOUTN", NULL, "Playback" },
|
||||
{ "VOUTP", NULL, "Playback" },
|
||||
};
|
||||
|
||||
static struct snd_soc_dai_driver ad73311_dai = {
|
||||
.name = "ad73311-hifi",
|
||||
.playback = {
|
||||
|
@ -39,7 +54,12 @@ static struct snd_soc_dai_driver ad73311_dai = {
|
|||
.formats = SNDRV_PCM_FMTBIT_S16_LE, },
|
||||
};
|
||||
|
||||
static struct snd_soc_codec_driver soc_codec_dev_ad73311;
|
||||
static struct snd_soc_codec_driver soc_codec_dev_ad73311 = {
|
||||
.dapm_widgets = ad73311_dapm_widgets,
|
||||
.num_dapm_widgets = ARRAY_SIZE(ad73311_dapm_widgets),
|
||||
.dapm_routes = ad73311_dapm_routes,
|
||||
.num_dapm_routes = ARRAY_SIZE(ad73311_dapm_routes),
|
||||
};
|
||||
|
||||
static int ad73311_probe(struct platform_device *pdev)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue