mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-08 01:29:02 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
Mark Brown 2013-08-22 14:28:30 +01:00
commit b8e58d4e2e
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sound/soc/codecs/bt-sco.c
View file

@ -15,15 +15,27 @@
#include <sound/soc.h>
static const struct snd_soc_dapm_widget bt_sco_widgets[] = {
SND_SOC_DAPM_INPUT("RX"),
SND_SOC_DAPM_OUTPUT("TX"),
};
static const struct snd_soc_dapm_route bt_sco_routes[] = {
{ "Capture", NULL, "RX" },
{ "TX", NULL, "Playback" },
};
static struct snd_soc_dai_driver bt_sco_dai = {
.name = "bt-sco-pcm",
.playback = {
.stream_name = "Playback",
.channels_min = 1,
.channels_max = 1,
.rates = SNDRV_PCM_RATE_8000,
.formats = SNDRV_PCM_FMTBIT_S16_LE,
},
.capture = {
.stream_name = "Capture",
.channels_min = 1,
.channels_max = 1,
.rates = SNDRV_PCM_RATE_8000,
@ -31,7 +43,12 @@ static struct snd_soc_dai_driver bt_sco_dai = {
},
};
static struct snd_soc_codec_driver soc_codec_dev_bt_sco;
static struct snd_soc_codec_driver soc_codec_dev_bt_sco = {
.dapm_widgets = bt_sco_widgets,
.num_dapm_widgets = ARRAY_SIZE(bt_sco_widgets),
.dapm_routes = bt_sco_routes,
.num_dapm_routes = ARRAY_SIZE(bt_sco_routes),
};
static int bt_sco_probe(struct platform_device *pdev)
{
@ -50,6 +67,9 @@ static struct platform_device_id bt_sco_driver_ids[] = {
{
.name = "dfbmcs320",
},
{
.name = "bt-sco",
},
{},
};
MODULE_DEVICE_TABLE(platform, bt_sco_driver_ids);