Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only. This project is read-only.

Commit 58698b95 authored Sep 24, 2013 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Sep 24, 2013

Merge "ASoC: wcd9xxx: Re-order codec DAIs definition"

parents 108b68f4 01402df2

sound/soc/codecs/wcd9306.c

+20 −20

Original line number	Diff line number	Diff line
		@@ -3696,28 +3696,28 @@ static struct snd_soc_dai_driver tapan9302_dai[] = {
		.ops = &tapan_dai_ops,
		},
		{
		.name = "tapan9302_tx3",
		.id = AIF3_CAP,
		.capture = {
		.stream_name = "AIF3 Capture",
		.name = "tapan9302_rx3",
		.id = AIF3_PB,
		.playback = {
		.stream_name = "AIF3 Playback",
		.rates = WCD9302_RATES,
		.formats = TAPAN_FORMATS,
		.rate_max = 48000,
		.rate_min = 8000,
		.rate_max = 48000,
		.channels_min = 1,
		.channels_max = 2,
		},
		.ops = &tapan_dai_ops,
		},
		{
		.name = "tapan9302_rx3",
		.id = AIF3_PB,
		.playback = {
		.stream_name = "AIF3 Playback",
		.name = "tapan9302_tx3",
		.id = AIF3_CAP,
		.capture = {
		.stream_name = "AIF3 Capture",
		.rates = WCD9302_RATES,
		.formats = TAPAN_FORMATS,
		.rate_min = 8000,
		.rate_max = 48000,
		.rate_min = 8000,
		.channels_min = 1,
		.channels_max = 2,
		},
		@@ -3783,28 +3783,28 @@ static struct snd_soc_dai_driver tapan_dai[] = {
		.ops = &tapan_dai_ops,
		},
		{
		.name = "tapan_tx3",
		.id = AIF3_CAP,
		.capture = {
		.stream_name = "AIF3 Capture",
		.name = "tapan_rx3",
		.id = AIF3_PB,
		.playback = {
		.stream_name = "AIF3 Playback",
		.rates = WCD9306_RATES,
		.formats = TAPAN_FORMATS,
		.rate_max = 48000,
		.rate_min = 8000,
		.rate_max = 192000,
		.channels_min = 1,
		.channels_max = 2,
		},
		.ops = &tapan_dai_ops,
		},
		{
		.name = "tapan_rx3",
		.id = AIF3_PB,
		.playback = {
		.stream_name = "AIF3 Playback",
		.name = "tapan_tx3",
		.id = AIF3_CAP,
		.capture = {
		.stream_name = "AIF3 Capture",
		.rates = WCD9306_RATES,
		.formats = TAPAN_FORMATS,
		.rate_max = 48000,
		.rate_min = 8000,
		.rate_max = 192000,
		.channels_min = 1,
		.channels_max = 2,
		},

sound/soc/codecs/wcd9310.c

+10 −10

Original line number	Diff line number	Diff line
		@@ -5132,28 +5132,28 @@ static struct snd_soc_dai_driver tabla_dai[] = {
		.ops = &tabla_dai_ops,
		},
		{
		.name = "tabla_tx3",
		.id = AIF3_CAP,
		.capture = {
		.stream_name = "AIF3 Capture",
		.name = "tabla_rx3",
		.id = AIF3_PB,
		.playback = {
		.stream_name = "AIF3 Playback",
		.rates = WCD9310_RATES,
		.formats = TABLA_FORMATS,
		.rate_max = 48000,
		.rate_min = 8000,
		.rate_max = 192000,
		.channels_min = 1,
		.channels_max = 2,
		},
		.ops = &tabla_dai_ops,
		},
		{
		.name = "tabla_rx3",
		.id = AIF3_PB,
		.playback = {
		.stream_name = "AIF3 Playback",
		.name = "tabla_tx3",
		.id = AIF3_CAP,
		.capture = {
		.stream_name = "AIF3 Capture",
		.rates = WCD9310_RATES,
		.formats = TABLA_FORMATS,
		.rate_max = 48000,
		.rate_min = 8000,
		.rate_max = 192000,
		.channels_min = 1,
		.channels_max = 2,
		},

sound/soc/codecs/wcd9320.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -4680,28 +4680,28 @@ static struct snd_soc_dai_driver taiko_dai[] = {
		.ops = &taiko_dai_ops,
		},
		{
		.name = "taiko_tx3",
		.id = AIF3_CAP,
		.capture = {
		.stream_name = "AIF3 Capture",
		.name = "taiko_rx3",
		.id = AIF3_PB,
		.playback = {
		.stream_name = "AIF3 Playback",
		.rates = WCD9320_RATES,
		.formats = TAIKO_FORMATS,
		.rate_max = 48000,
		.formats = TAIKO_FORMATS_S16_S24_LE,
		.rate_min = 8000,
		.rate_max = 192000,
		.channels_min = 1,
		.channels_max = 2,
		},
		.ops = &taiko_dai_ops,
		},
		{
		.name = "taiko_rx3",
		.id = AIF3_PB,
		.playback = {
		.stream_name = "AIF3 Playback",
		.name = "taiko_tx3",
		.id = AIF3_CAP,
		.capture = {
		.stream_name = "AIF3 Capture",
		.rates = WCD9320_RATES,
		.formats = TAIKO_FORMATS_S16_S24_LE,
		.formats = TAIKO_FORMATS,
		.rate_max = 48000,
		.rate_min = 8000,
		.rate_max = 192000,
		.channels_min = 1,
		.channels_max = 2,
		},