Skip to content

Commit

Permalink
ASoC: twl6040: add all ABE DAIs
Browse files Browse the repository at this point in the history
Add all DAIs to fully support OMAP4 ABE.

Signed-off-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Liam Girdwood authored and Peter Ujfalusi committed Jul 4, 2011
1 parent 87b25c1 commit 6510bdc
Showing 1 changed file with 36 additions and 8 deletions.
44 changes: 36 additions & 8 deletions sound/soc/codecs/twl6040.c
Original file line number Diff line number Diff line change
Expand Up @@ -1359,23 +1359,51 @@ static struct snd_soc_dai_ops twl6040_dai_ops = {
.set_sysclk = twl6040_set_dai_sysclk,
};

static struct snd_soc_dai_driver twl6040_dai = {
.name = "twl6040-hifi",
static struct snd_soc_dai_driver twl6040_dai[] = {
{
.name = "twl6040-ul",
.capture = {
.stream_name = "Capture",
.channels_min = 1,
.channels_max = 2,
.rates = TWL6040_RATES,
.formats = TWL6040_FORMATS,
},
.ops = &twl6040_dai_ops,
},
{
.name = "twl6040-dl1",
.playback = {
.stream_name = "Playback",
.stream_name = "Headset Playback",
.channels_min = 1,
.channels_max = 4,
.channels_max = 2,
.rates = TWL6040_RATES,
.formats = TWL6040_FORMATS,
},
.capture = {
.stream_name = "Capture",
.ops = &twl6040_dai_ops,
},
{
.name = "twl6040-dl2",
.playback = {
.stream_name = "Handsfree Playback",
.channels_min = 1,
.channels_max = 2,
.rates = TWL6040_RATES,
.formats = TWL6040_FORMATS,
},
.ops = &twl6040_dai_ops,
},
{
.name = "twl6040-vib",
.playback = {
.stream_name = "Vibra Playback",
.channels_min = 2,
.channels_max = 2,
.rates = SNDRV_PCM_RATE_CONTINUOUS,
.formats = TWL6040_FORMATS,
},
.ops = &twl6040_dai_ops,
},
};

#ifdef CONFIG_PM
Expand Down Expand Up @@ -1502,8 +1530,8 @@ static struct snd_soc_codec_driver soc_codec_dev_twl6040 = {

static int __devinit twl6040_codec_probe(struct platform_device *pdev)
{
return snd_soc_register_codec(&pdev->dev,
&soc_codec_dev_twl6040, &twl6040_dai, 1);
return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_twl6040,
twl6040_dai, ARRAY_SIZE(twl6040_dai));
}

static int __devexit twl6040_codec_remove(struct platform_device *pdev)
Expand Down

0 comments on commit 6510bdc

Please sign in to comment.