diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-09-27 19:52:38 +0100 |
---|---|---|
committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-03-26 12:09:30 +0000 |
commit | 3d24b017a6f5463cb00271b457d428a353b021a2 (patch) | |
tree | a2d80673b4309a937c7fe32fc2fe21f6e6c80692 /sound | |
parent | cc0ce5412df15f354128c12f04a666aaaf8ba51c (diff) |
update
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/sa11x0/assabet.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/sound/soc/sa11x0/assabet.c b/sound/soc/sa11x0/assabet.c index d6c9cbefc1f6..5b11856d5abf 100644 --- a/sound/soc/sa11x0/assabet.c +++ b/sound/soc/sa11x0/assabet.c @@ -272,16 +272,18 @@ static struct snd_soc_ops assabet_asoc_ops = { .shutdown = assabet_asoc_shutdown, }; -static struct snd_soc_dai_link assabet_asoc_dai = { - .name = "Assabet", - .stream_name = "assabet-ssp", - .codec_name = "uda134x-codec", - .platform_name = "sa11x0-ssp", - .cpu_dai_name = "sa11x0-ssp", - .codec_dai_name = "uda134x-hifi", - .ops = &assabet_asoc_ops, - .dai_fmt = SND_SOC_DAIFMT_RIGHT_J | SND_SOC_DAIFMT_NB_NF | - SND_SOC_DAIFMT_CBS_CFS, +static struct snd_soc_dai_link assabet_asoc_dais[] = { + { + .name = "Assabet", + .stream_name = "System Playback/Capture", + .cpu_dai_name = "sa11x0-ssp", + .codec_name = "uda134x-codec", + .codec_dai_name = "uda134x-hifi", + .platform_name = "sa11x0-ssp", + .dai_fmt = SND_SOC_DAIFMT_RIGHT_J | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + .ops = &assabet_asoc_ops, + }, }; static int @@ -307,8 +309,8 @@ static const struct snd_soc_dapm_route assabet_dapm_routes[] = { static struct snd_soc_card snd_soc_assabet = { .name = "Assabet", .resume_pre = assabet_asoc_resume_pre, - .dai_link = &assabet_asoc_dai, - .num_links = 1, + .dai_link = assabet_asoc_dais, + .num_links = ARRAY_SIZE(assabet_asoc_dais), .dapm_widgets = assabet_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(assabet_dapm_widgets), .dapm_routes = assabet_dapm_routes, @@ -470,7 +472,7 @@ static int assabet_init(void) local_irq_restore(flags); soc = platform_device_alloc("assabet-asoc", -1); - uda = platform_device_alloc(assabet_asoc_dai.codec_name, -1); + uda = platform_device_alloc(assabet_asoc_dais[0].codec_name, -1); dma = platform_device_alloc("soc-dmaengine", -1); if (!soc || !uda || !dma) { ret = -ENOMEM; |