mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
Merge branch 'for-2.6.38' into for-2.6.39
This commit is contained in:
commit
16f9e062a7
10 changed files with 18 additions and 18 deletions
|
@ -129,7 +129,7 @@ static struct snd_soc_dai_link afeb9260_dai = {
|
|||
.cpu_dai_name = "atmel-ssc-dai.0",
|
||||
.codec_dai_name = "tlv320aic23-hifi",
|
||||
.platform_name = "atmel_pcm-audio",
|
||||
.codec_name = "tlv320aic23-codec.0-0x1a",
|
||||
.codec_name = "tlv320aic23-codec.0-001a",
|
||||
.init = afeb9260_tlv320aic23_init,
|
||||
.ops = &afeb9260_ops,
|
||||
};
|
||||
|
|
|
@ -119,7 +119,7 @@ static struct snd_soc_dai_link bf5xx_ssm2602_dai = {
|
|||
.cpu_dai_name = "bf5xx-i2s",
|
||||
.codec_dai_name = "ssm2602-hifi",
|
||||
.platform_name = "bf5xx-pcm-audio",
|
||||
.codec_name = "ssm2602-codec.0-0x1b",
|
||||
.codec_name = "ssm2602-codec.0-001b",
|
||||
.ops = &bf5xx_ssm2602_ops,
|
||||
};
|
||||
|
||||
|
|
|
@ -307,10 +307,10 @@ static int corgi_wm8731_init(struct snd_soc_pcm_runtime *rtd)
|
|||
static struct snd_soc_dai_link corgi_dai = {
|
||||
.name = "WM8731",
|
||||
.stream_name = "WM8731",
|
||||
.cpu_dai_name = "pxa-is2-dai",
|
||||
.cpu_dai_name = "pxa2xx-i2s",
|
||||
.codec_dai_name = "wm8731-hifi",
|
||||
.platform_name = "pxa-pcm-audio",
|
||||
.codec_name = "wm8731-codec-0.001a",
|
||||
.codec_name = "wm8731-codec-0.001b",
|
||||
.init = corgi_wm8731_init,
|
||||
.ops = &corgi_ops,
|
||||
};
|
||||
|
|
|
@ -276,7 +276,7 @@ static struct snd_soc_dai_link poodle_dai = {
|
|||
.cpu_dai_name = "pxa2xx-i2s",
|
||||
.codec_dai_name = "wm8731-hifi",
|
||||
.platform_name = "pxa-pcm-audio",
|
||||
.codec_name = "wm8731-codec.0-001a",
|
||||
.codec_name = "wm8731-codec.0-001b",
|
||||
.init = poodle_wm8731_init,
|
||||
.ops = &poodle_ops,
|
||||
};
|
||||
|
|
|
@ -315,10 +315,10 @@ static int spitz_wm8750_init(struct snd_soc_pcm_runtime *rtd)
|
|||
static struct snd_soc_dai_link spitz_dai = {
|
||||
.name = "wm8750",
|
||||
.stream_name = "WM8750",
|
||||
.cpu_dai_name = "pxa-is2",
|
||||
.cpu_dai_name = "pxa2xx-i2s",
|
||||
.codec_dai_name = "wm8750-hifi",
|
||||
.platform_name = "pxa-pcm-audio",
|
||||
.codec_name = "wm8750-codec.0-001a",
|
||||
.codec_name = "wm8750-codec.0-001b",
|
||||
.init = spitz_wm8750_init,
|
||||
.ops = &spitz_ops,
|
||||
};
|
||||
|
|
|
@ -387,11 +387,11 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = {
|
|||
{ /* Hifi Playback - for similatious use with voice below */
|
||||
.name = "WM8753",
|
||||
.stream_name = "WM8753 HiFi",
|
||||
.cpu_dai_name = "s3c24xx-i2s",
|
||||
.cpu_dai_name = "s3c24xx-iis",
|
||||
.codec_dai_name = "wm8753-hifi",
|
||||
.init = neo1973_gta02_wm8753_init,
|
||||
.platform_name = "samsung-audio",
|
||||
.codec_name = "wm8753-codec.0-0x1a",
|
||||
.codec_name = "wm8753-codec.0-001a",
|
||||
.ops = &neo1973_gta02_hifi_ops,
|
||||
},
|
||||
{ /* Voice via BT */
|
||||
|
@ -400,7 +400,7 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = {
|
|||
.cpu_dai_name = "bluetooth-dai",
|
||||
.codec_dai_name = "wm8753-voice",
|
||||
.ops = &neo1973_gta02_voice_ops,
|
||||
.codec_name = "wm8753-codec.0-0x1a",
|
||||
.codec_name = "wm8753-codec.0-001a",
|
||||
.platform_name = "samsung-audio",
|
||||
},
|
||||
};
|
||||
|
|
|
@ -559,9 +559,9 @@ static struct snd_soc_dai_link neo1973_dai[] = {
|
|||
.name = "WM8753",
|
||||
.stream_name = "WM8753 HiFi",
|
||||
.platform_name = "samsung-audio",
|
||||
.cpu_dai_name = "s3c24xx-i2s",
|
||||
.cpu_dai_name = "s3c24xx-iis",
|
||||
.codec_dai_name = "wm8753-hifi",
|
||||
.codec_name = "wm8753-codec.0-0x1a",
|
||||
.codec_name = "wm8753-codec.0-001a",
|
||||
.init = neo1973_wm8753_init,
|
||||
.ops = &neo1973_hifi_ops,
|
||||
},
|
||||
|
@ -571,7 +571,7 @@ static struct snd_soc_dai_link neo1973_dai[] = {
|
|||
.platform_name = "samsung-audio",
|
||||
.cpu_dai_name = "bluetooth-dai",
|
||||
.codec_dai_name = "wm8753-voice",
|
||||
.codec_name = "wm8753-codec.0-0x1a",
|
||||
.codec_name = "wm8753-codec.0-001a",
|
||||
.ops = &neo1973_voice_ops,
|
||||
},
|
||||
};
|
||||
|
|
|
@ -84,8 +84,8 @@ static int simtec_hermes_init(struct snd_soc_pcm_runtime *rtd)
|
|||
static struct snd_soc_dai_link simtec_dai_aic33 = {
|
||||
.name = "tlv320aic33",
|
||||
.stream_name = "TLV320AIC33",
|
||||
.codec_name = "tlv320aic3x-codec.0-0x1a",
|
||||
.cpu_dai_name = "s3c24xx-i2s",
|
||||
.codec_name = "tlv320aic3x-codec.0-001a",
|
||||
.cpu_dai_name = "s3c24xx-iis",
|
||||
.codec_dai_name = "tlv320aic3x-hifi",
|
||||
.platform_name = "samsung-audio",
|
||||
.init = simtec_hermes_init,
|
||||
|
|
|
@ -73,8 +73,8 @@ static int simtec_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd)
|
|||
static struct snd_soc_dai_link simtec_dai_aic23 = {
|
||||
.name = "tlv320aic23",
|
||||
.stream_name = "TLV320AIC23",
|
||||
.codec_name = "tlv320aic3x-codec.0-0x1a",
|
||||
.cpu_dai_name = "s3c24xx-i2s",
|
||||
.codec_name = "tlv320aic3x-codec.0-001a",
|
||||
.cpu_dai_name = "s3c24xx-iis",
|
||||
.codec_dai_name = "tlv320aic3x-hifi",
|
||||
.platform_name = "samsung-audio",
|
||||
.init = simtec_tlv320aic23_init,
|
||||
|
|
|
@ -221,7 +221,7 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = {
|
|||
.stream_name = "UDA134X",
|
||||
.codec_name = "uda134x-hifi",
|
||||
.codec_dai_name = "uda134x-hifi",
|
||||
.cpu_dai_name = "s3c24xx-i2s",
|
||||
.cpu_dai_name = "s3c24xx-iis",
|
||||
.ops = &s3c24xx_uda134x_ops,
|
||||
.platform_name = "samsung-audio",
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue