Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-19 03:31:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'fix/asoc' into for-linus

Browse Source
This commit is contained in:
Takashi Iwai 2011-01-28 08:25:43 +01:00
commit dcc3c4c016
14 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/atmel/snd-soc-afeb9260.c
View File

@ -129,7 +129,7 @@ static struct snd_soc_dai_link afeb9260_dai = {
.cpu_dai_name = "atmel-ssc-dai.0", .cpu_dai_name = "atmel-ssc-dai.0",
.codec_dai_name = "tlv320aic23-hifi", .codec_dai_name = "tlv320aic23-hifi",
.platform_name = "atmel_pcm-audio", .platform_name = "atmel_pcm-audio",
.codec_name = "tlv320aic23-codec.0-0x1a", .codec_name = "tlv320aic23-codec.0-001a",
.init = afeb9260_tlv320aic23_init, .init = afeb9260_tlv320aic23_init,
.ops = &afeb9260_ops, .ops = &afeb9260_ops,
}; };

2
sound/soc/blackfin/bf5xx-ssm2602.c
View File

@ -119,7 +119,7 @@ static struct snd_soc_dai_link bf5xx_ssm2602_dai = {
.cpu_dai_name = "bf5xx-i2s", .cpu_dai_name = "bf5xx-i2s",
.codec_dai_name = "ssm2602-hifi", .codec_dai_name = "ssm2602-hifi",
.platform_name = "bf5xx-pcm-audio", .platform_name = "bf5xx-pcm-audio",
.codec_name = "ssm2602-codec.0-0x1b", .codec_name = "ssm2602-codec.0-001b",
.ops = &bf5xx_ssm2602_ops, .ops = &bf5xx_ssm2602_ops,
}; };

2
sound/soc/codecs/wm8994.c
View File

@ -2386,7 +2386,7 @@ static int wm8994_set_tristate(struct snd_soc_dai *codec_dai, int tristate)
else else
val = 0; val = 0;
return snd_soc_update_bits(codec, reg, mask, reg); return snd_soc_update_bits(codec, reg, mask, val);
} }
#define WM8994_RATES SNDRV_PCM_RATE_8000_96000 #define WM8994_RATES SNDRV_PCM_RATE_8000_96000

2
sound/soc/codecs/wm8995.c
View File

@ -1223,7 +1223,7 @@ static int wm8995_set_tristate(struct snd_soc_dai *codec_dai, int tristate)
else else
val = 0; val = 0;
return snd_soc_update_bits(codec, reg, mask, reg); return snd_soc_update_bits(codec, reg, mask, val);
} }
/* The size in bits of the FLL divide multiplied by 10 /* The size in bits of the FLL divide multiplied by 10

15
sound/soc/codecs/wm_hubs.c
View File

@ -91,6 +91,7 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, unsigned int op)
static void calibrate_dc_servo(struct snd_soc_codec *codec) static void calibrate_dc_servo(struct snd_soc_codec *codec)
{ {
struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);
s8 offset;
u16 reg, reg_l, reg_r, dcs_cfg; u16 reg, reg_l, reg_r, dcs_cfg;
/* If we're using a digital only path and have a previously /* If we're using a digital only path and have a previously
@ -149,16 +150,14 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec)
hubs->dcs_codes); hubs->dcs_codes);
/* HPOUT1L */ /* HPOUT1L */
if (reg_l + hubs->dcs_codes > 0 && offset = reg_l;
reg_l + hubs->dcs_codes < 0xff) offset += hubs->dcs_codes;
reg_l += hubs->dcs_codes; dcs_cfg = (u8)offset << WM8993_DCS_DAC_WR_VAL_1_SHIFT;
dcs_cfg = reg_l << WM8993_DCS_DAC_WR_VAL_1_SHIFT;
/* HPOUT1R */ /* HPOUT1R */
if (reg_r + hubs->dcs_codes > 0 && offset = reg_r;
reg_r + hubs->dcs_codes < 0xff) offset += hubs->dcs_codes;
reg_r += hubs->dcs_codes; dcs_cfg |= (u8)offset;
dcs_cfg |= reg_r;
dev_dbg(codec->dev, "DCS result: %x\n", dcs_cfg); dev_dbg(codec->dev, "DCS result: %x\n", dcs_cfg);

2
sound/soc/davinci/davinci-evm.c
View File

@ -223,7 +223,7 @@ static struct snd_soc_dai_link da8xx_evm_dai = {
.stream_name = "AIC3X", .stream_name = "AIC3X",
.cpu_dai_name= "davinci-mcasp.0", .cpu_dai_name= "davinci-mcasp.0",
.codec_dai_name = "tlv320aic3x-hifi", .codec_dai_name = "tlv320aic3x-hifi",
.codec_name = "tlv320aic3x-codec.0-001a", .codec_name = "tlv320aic3x-codec.1-0018",
.platform_name = "davinci-pcm-audio", .platform_name = "davinci-pcm-audio",
.init = evm_aic3x_init, .init = evm_aic3x_init,
.ops = &evm_ops, .ops = &evm_ops,

4
sound/soc/pxa/corgi.c
View File

@ -307,10 +307,10 @@ static int corgi_wm8731_init(struct snd_soc_pcm_runtime *rtd)
static struct snd_soc_dai_link corgi_dai = { static struct snd_soc_dai_link corgi_dai = {
.name = "WM8731", .name = "WM8731",
.stream_name = "WM8731", .stream_name = "WM8731",
.cpu_dai_name = "pxa-is2-dai", .cpu_dai_name = "pxa2xx-i2s",
.codec_dai_name = "wm8731-hifi", .codec_dai_name = "wm8731-hifi",
.platform_name = "pxa-pcm-audio", .platform_name = "pxa-pcm-audio",
.codec_name = "wm8731-codec-0.001a", .codec_name = "wm8731-codec-0.001b",
.init = corgi_wm8731_init, .init = corgi_wm8731_init,
.ops = &corgi_ops, .ops = &corgi_ops,
}; };

2
sound/soc/pxa/poodle.c
View File

@ -276,7 +276,7 @@ static struct snd_soc_dai_link poodle_dai = {
.cpu_dai_name = "pxa2xx-i2s", .cpu_dai_name = "pxa2xx-i2s",
.codec_dai_name = "wm8731-hifi", .codec_dai_name = "wm8731-hifi",
.platform_name = "pxa-pcm-audio", .platform_name = "pxa-pcm-audio",
.codec_name = "wm8731-codec.0-001a", .codec_name = "wm8731-codec.0-001b",
.init = poodle_wm8731_init, .init = poodle_wm8731_init,
.ops = &poodle_ops, .ops = &poodle_ops,
}; };

4
sound/soc/pxa/spitz.c
View File

@ -315,10 +315,10 @@ static int spitz_wm8750_init(struct snd_soc_pcm_runtime *rtd)
static struct snd_soc_dai_link spitz_dai = { static struct snd_soc_dai_link spitz_dai = {
.name = "wm8750", .name = "wm8750",
.stream_name = "WM8750", .stream_name = "WM8750",
.cpu_dai_name = "pxa-is2", .cpu_dai_name = "pxa2xx-i2s",
.codec_dai_name = "wm8750-hifi", .codec_dai_name = "wm8750-hifi",
.platform_name = "pxa-pcm-audio", .platform_name = "pxa-pcm-audio",
.codec_name = "wm8750-codec.0-001a", .codec_name = "wm8750-codec.0-001b",
.init = spitz_wm8750_init, .init = spitz_wm8750_init,
.ops = &spitz_ops, .ops = &spitz_ops,
}; };

6
sound/soc/samsung/neo1973_gta02_wm8753.c
View File

@ -397,11 +397,11 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = {
{ /* Hifi Playback - for similatious use with voice below */ { /* Hifi Playback - for similatious use with voice below */
.name = "WM8753", .name = "WM8753",
.stream_name = "WM8753 HiFi", .stream_name = "WM8753 HiFi",
.cpu_dai_name = "s3c24xx-i2s", .cpu_dai_name = "s3c24xx-iis",
.codec_dai_name = "wm8753-hifi", .codec_dai_name = "wm8753-hifi",
.init = neo1973_gta02_wm8753_init, .init = neo1973_gta02_wm8753_init,
.platform_name = "samsung-audio", .platform_name = "samsung-audio",
.codec_name = "wm8753-codec.0-0x1a", .codec_name = "wm8753-codec.0-001a",
.ops = &neo1973_gta02_hifi_ops, .ops = &neo1973_gta02_hifi_ops,
}, },
{ /* Voice via BT */ { /* Voice via BT */
@ -410,7 +410,7 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = {
.cpu_dai_name = "bluetooth-dai", .cpu_dai_name = "bluetooth-dai",
.codec_dai_name = "wm8753-voice", .codec_dai_name = "wm8753-voice",
.ops = &neo1973_gta02_voice_ops, .ops = &neo1973_gta02_voice_ops,
.codec_name = "wm8753-codec.0-0x1a", .codec_name = "wm8753-codec.0-001a",
.platform_name = "samsung-audio", .platform_name = "samsung-audio",
}, },
}; };

6
sound/soc/samsung/neo1973_wm8753.c
View File

@ -559,9 +559,9 @@ static struct snd_soc_dai_link neo1973_dai[] = {
.name = "WM8753", .name = "WM8753",
.stream_name = "WM8753 HiFi", .stream_name = "WM8753 HiFi",
.platform_name = "samsung-audio", .platform_name = "samsung-audio",
.cpu_dai_name = "s3c24xx-i2s", .cpu_dai_name = "s3c24xx-iis",
.codec_dai_name = "wm8753-hifi", .codec_dai_name = "wm8753-hifi",
.codec_name = "wm8753-codec.0-0x1a", .codec_name = "wm8753-codec.0-001a",
.init = neo1973_wm8753_init, .init = neo1973_wm8753_init,
.ops = &neo1973_hifi_ops, .ops = &neo1973_hifi_ops,
}, },
@ -571,7 +571,7 @@ static struct snd_soc_dai_link neo1973_dai[] = {
.platform_name = "samsung-audio", .platform_name = "samsung-audio",
.cpu_dai_name = "bluetooth-dai", .cpu_dai_name = "bluetooth-dai",
.codec_dai_name = "wm8753-voice", .codec_dai_name = "wm8753-voice",
.codec_name = "wm8753-codec.0-0x1a", .codec_name = "wm8753-codec.0-001a",
.ops = &neo1973_voice_ops, .ops = &neo1973_voice_ops,
}, },
}; };

4
sound/soc/samsung/s3c24xx_simtec_hermes.c
View File

@ -94,8 +94,8 @@ static int simtec_hermes_init(struct snd_soc_pcm_runtime *rtd)
static struct snd_soc_dai_link simtec_dai_aic33 = { static struct snd_soc_dai_link simtec_dai_aic33 = {
.name = "tlv320aic33", .name = "tlv320aic33",
.stream_name = "TLV320AIC33", .stream_name = "TLV320AIC33",
.codec_name = "tlv320aic3x-codec.0-0x1a", .codec_name = "tlv320aic3x-codec.0-001a",
.cpu_dai_name = "s3c24xx-i2s", .cpu_dai_name = "s3c24xx-iis",
.codec_dai_name = "tlv320aic3x-hifi", .codec_dai_name = "tlv320aic3x-hifi",
.platform_name = "samsung-audio", .platform_name = "samsung-audio",
.init = simtec_hermes_init, .init = simtec_hermes_init,

4
sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c
View File

@ -85,8 +85,8 @@ static int simtec_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd)
static struct snd_soc_dai_link simtec_dai_aic23 = { static struct snd_soc_dai_link simtec_dai_aic23 = {
.name = "tlv320aic23", .name = "tlv320aic23",
.stream_name = "TLV320AIC23", .stream_name = "TLV320AIC23",
.codec_name = "tlv320aic3x-codec.0-0x1a", .codec_name = "tlv320aic3x-codec.0-001a",
.cpu_dai_name = "s3c24xx-i2s", .cpu_dai_name = "s3c24xx-iis",
.codec_dai_name = "tlv320aic3x-hifi", .codec_dai_name = "tlv320aic3x-hifi",
.platform_name = "samsung-audio", .platform_name = "samsung-audio",
.init = simtec_tlv320aic23_init, .init = simtec_tlv320aic23_init,

2
sound/soc/samsung/s3c24xx_uda134x.c
View File

@ -228,7 +228,7 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = {
.stream_name = "UDA134X", .stream_name = "UDA134X",
.codec_name = "uda134x-hifi", .codec_name = "uda134x-hifi",
.codec_dai_name = "uda134x-hifi", .codec_dai_name = "uda134x-hifi",
.cpu_dai_name = "s3c24xx-i2s", .cpu_dai_name = "s3c24xx-iis",
.ops = &s3c24xx_uda134x_ops, .ops = &s3c24xx_uda134x_ops,
.platform_name = "samsung-audio", .platform_name = "samsung-audio",
}; };