diff options
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/atmel/snd-soc-afeb9260.c | 2 | ||||
-rw-r--r-- | sound/soc/blackfin/Kconfig | 11 | ||||
-rw-r--r-- | sound/soc/blackfin/bf5xx-ac97.c | 4 | ||||
-rw-r--r-- | sound/soc/blackfin/bf5xx-ssm2602.c | 2 | ||||
-rw-r--r-- | sound/soc/blackfin/bf5xx-tdm.c | 10 | ||||
-rw-r--r-- | sound/soc/codecs/cq93vc.c | 2 | ||||
-rw-r--r-- | sound/soc/codecs/cx20442.c | 3 | ||||
-rw-r--r-- | sound/soc/codecs/wm8994.c | 2 | ||||
-rw-r--r-- | sound/soc/codecs/wm8995.c | 2 | ||||
-rw-r--r-- | sound/soc/codecs/wm_hubs.c | 15 | ||||
-rw-r--r-- | sound/soc/davinci/davinci-evm.c | 2 | ||||
-rw-r--r-- | sound/soc/omap/ams-delta.c | 2 | ||||
-rw-r--r-- | sound/soc/pxa/corgi.c | 4 | ||||
-rw-r--r-- | sound/soc/pxa/poodle.c | 2 | ||||
-rw-r--r-- | sound/soc/pxa/spitz.c | 4 | ||||
-rw-r--r-- | sound/soc/pxa/z2.c | 3 | ||||
-rw-r--r-- | sound/soc/samsung/neo1973_gta02_wm8753.c | 6 | ||||
-rw-r--r-- | sound/soc/samsung/neo1973_wm8753.c | 6 | ||||
-rw-r--r-- | sound/soc/samsung/s3c24xx_simtec_hermes.c | 4 | ||||
-rw-r--r-- | sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 4 | ||||
-rw-r--r-- | sound/soc/samsung/s3c24xx_uda134x.c | 2 | ||||
-rw-r--r-- | sound/soc/soc-core.c | 3 | ||||
-rw-r--r-- | sound/soc/soc-dapm.c | 6 |
23 files changed, 50 insertions, 51 deletions
diff --git a/sound/soc/atmel/snd-soc-afeb9260.c b/sound/soc/atmel/snd-soc-afeb9260.c index da2208e06b0..5e4d499d843 100644 --- a/sound/soc/atmel/snd-soc-afeb9260.c +++ b/sound/soc/atmel/snd-soc-afeb9260.c | |||
@@ -129,7 +129,7 @@ static struct snd_soc_dai_link afeb9260_dai = { | |||
129 | .cpu_dai_name = "atmel-ssc-dai.0", | 129 | .cpu_dai_name = "atmel-ssc-dai.0", |
130 | .codec_dai_name = "tlv320aic23-hifi", | 130 | .codec_dai_name = "tlv320aic23-hifi", |
131 | .platform_name = "atmel_pcm-audio", | 131 | .platform_name = "atmel_pcm-audio", |
132 | .codec_name = "tlv320aic23-codec.0-0x1a", | 132 | .codec_name = "tlv320aic23-codec.0-001a", |
133 | .init = afeb9260_tlv320aic23_init, | 133 | .init = afeb9260_tlv320aic23_init, |
134 | .ops = &afeb9260_ops, | 134 | .ops = &afeb9260_ops, |
135 | }; | 135 | }; |
diff --git a/sound/soc/blackfin/Kconfig b/sound/soc/blackfin/Kconfig index 3abeeddc67d..ae403597fd3 100644 --- a/sound/soc/blackfin/Kconfig +++ b/sound/soc/blackfin/Kconfig | |||
@@ -1,6 +1,7 @@ | |||
1 | config SND_BF5XX_I2S | 1 | config SND_BF5XX_I2S |
2 | tristate "SoC I2S Audio for the ADI BF5xx chip" | 2 | tristate "SoC I2S Audio for the ADI BF5xx chip" |
3 | depends on BLACKFIN | 3 | depends on BLACKFIN |
4 | select SND_BF5XX_SOC_SPORT | ||
4 | help | 5 | help |
5 | Say Y or M if you want to add support for codecs attached to | 6 | Say Y or M if you want to add support for codecs attached to |
6 | the Blackfin SPORT (synchronous serial ports) interface in I2S | 7 | the Blackfin SPORT (synchronous serial ports) interface in I2S |
@@ -35,6 +36,7 @@ config SND_BFIN_AD73311_SE | |||
35 | config SND_BF5XX_TDM | 36 | config SND_BF5XX_TDM |
36 | tristate "SoC I2S(TDM mode) Audio for the ADI BF5xx chip" | 37 | tristate "SoC I2S(TDM mode) Audio for the ADI BF5xx chip" |
37 | depends on (BLACKFIN && SND_SOC) | 38 | depends on (BLACKFIN && SND_SOC) |
39 | select SND_BF5XX_SOC_SPORT | ||
38 | help | 40 | help |
39 | Say Y or M if you want to add support for codecs attached to | 41 | Say Y or M if you want to add support for codecs attached to |
40 | the Blackfin SPORT (synchronous serial ports) interface in TDM | 42 | the Blackfin SPORT (synchronous serial ports) interface in TDM |
@@ -61,6 +63,10 @@ config SND_BF5XX_SOC_AD193X | |||
61 | config SND_BF5XX_AC97 | 63 | config SND_BF5XX_AC97 |
62 | tristate "SoC AC97 Audio for the ADI BF5xx chip" | 64 | tristate "SoC AC97 Audio for the ADI BF5xx chip" |
63 | depends on BLACKFIN | 65 | depends on BLACKFIN |
66 | select AC97_BUS | ||
67 | select SND_SOC_AC97_BUS | ||
68 | select SND_BF5XX_SOC_SPORT | ||
69 | select SND_BF5XX_SOC_AC97 | ||
64 | help | 70 | help |
65 | Say Y or M if you want to add support for codecs attached to | 71 | Say Y or M if you want to add support for codecs attached to |
66 | the Blackfin SPORT (synchronous serial ports) interface in slot 16 | 72 | the Blackfin SPORT (synchronous serial ports) interface in slot 16 |
@@ -122,17 +128,12 @@ config SND_BF5XX_SOC_SPORT | |||
122 | 128 | ||
123 | config SND_BF5XX_SOC_I2S | 129 | config SND_BF5XX_SOC_I2S |
124 | tristate | 130 | tristate |
125 | select SND_BF5XX_SOC_SPORT | ||
126 | 131 | ||
127 | config SND_BF5XX_SOC_TDM | 132 | config SND_BF5XX_SOC_TDM |
128 | tristate | 133 | tristate |
129 | select SND_BF5XX_SOC_SPORT | ||
130 | 134 | ||
131 | config SND_BF5XX_SOC_AC97 | 135 | config SND_BF5XX_SOC_AC97 |
132 | tristate | 136 | tristate |
133 | select AC97_BUS | ||
134 | select SND_SOC_AC97_BUS | ||
135 | select SND_BF5XX_SOC_SPORT | ||
136 | 137 | ||
137 | config SND_BF5XX_SPORT_NUM | 138 | config SND_BF5XX_SPORT_NUM |
138 | int "Set a SPORT for Sound chip" | 139 | int "Set a SPORT for Sound chip" |
diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c index c5f856ec27c..ffbac26b9bc 100644 --- a/sound/soc/blackfin/bf5xx-ac97.c +++ b/sound/soc/blackfin/bf5xx-ac97.c | |||
@@ -260,9 +260,9 @@ static int bf5xx_ac97_suspend(struct snd_soc_dai *dai) | |||
260 | pr_debug("%s : sport %d\n", __func__, dai->id); | 260 | pr_debug("%s : sport %d\n", __func__, dai->id); |
261 | if (!dai->active) | 261 | if (!dai->active) |
262 | return 0; | 262 | return 0; |
263 | if (dai->capture.active) | 263 | if (dai->capture_active) |
264 | sport_rx_stop(sport); | 264 | sport_rx_stop(sport); |
265 | if (dai->playback.active) | 265 | if (dai->playback_active) |
266 | sport_tx_stop(sport); | 266 | sport_tx_stop(sport); |
267 | return 0; | 267 | return 0; |
268 | } | 268 | } |
diff --git a/sound/soc/blackfin/bf5xx-ssm2602.c b/sound/soc/blackfin/bf5xx-ssm2602.c index e902b24c185..ad28663f5bb 100644 --- a/sound/soc/blackfin/bf5xx-ssm2602.c +++ b/sound/soc/blackfin/bf5xx-ssm2602.c | |||
@@ -119,7 +119,7 @@ static struct snd_soc_dai_link bf5xx_ssm2602_dai = { | |||
119 | .cpu_dai_name = "bf5xx-i2s", | 119 | .cpu_dai_name = "bf5xx-i2s", |
120 | .codec_dai_name = "ssm2602-hifi", | 120 | .codec_dai_name = "ssm2602-hifi", |
121 | .platform_name = "bf5xx-pcm-audio", | 121 | .platform_name = "bf5xx-pcm-audio", |
122 | .codec_name = "ssm2602-codec.0-0x1b", | 122 | .codec_name = "ssm2602-codec.0-001b", |
123 | .ops = &bf5xx_ssm2602_ops, | 123 | .ops = &bf5xx_ssm2602_ops, |
124 | }; | 124 | }; |
125 | 125 | ||
diff --git a/sound/soc/blackfin/bf5xx-tdm.c b/sound/soc/blackfin/bf5xx-tdm.c index 125123929f1..5515ac9e05c 100644 --- a/sound/soc/blackfin/bf5xx-tdm.c +++ b/sound/soc/blackfin/bf5xx-tdm.c | |||
@@ -210,7 +210,7 @@ static int bf5xx_tdm_set_channel_map(struct snd_soc_dai *dai, | |||
210 | #ifdef CONFIG_PM | 210 | #ifdef CONFIG_PM |
211 | static int bf5xx_tdm_suspend(struct snd_soc_dai *dai) | 211 | static int bf5xx_tdm_suspend(struct snd_soc_dai *dai) |
212 | { | 212 | { |
213 | struct sport_device *sport = dai->private_data; | 213 | struct sport_device *sport = snd_soc_dai_get_drvdata(dai); |
214 | 214 | ||
215 | if (!dai->active) | 215 | if (!dai->active) |
216 | return 0; | 216 | return 0; |
@@ -235,13 +235,13 @@ static int bf5xx_tdm_resume(struct snd_soc_dai *dai) | |||
235 | ret = -EBUSY; | 235 | ret = -EBUSY; |
236 | } | 236 | } |
237 | 237 | ||
238 | ret = sport_config_rx(sport, IRFS, 0x1F, 0, 0); | 238 | ret = sport_config_rx(sport, 0, 0x1F, 0, 0); |
239 | if (ret) { | 239 | if (ret) { |
240 | pr_err("SPORT is busy!\n"); | 240 | pr_err("SPORT is busy!\n"); |
241 | ret = -EBUSY; | 241 | ret = -EBUSY; |
242 | } | 242 | } |
243 | 243 | ||
244 | ret = sport_config_tx(sport, ITFS, 0x1F, 0, 0); | 244 | ret = sport_config_tx(sport, 0, 0x1F, 0, 0); |
245 | if (ret) { | 245 | if (ret) { |
246 | pr_err("SPORT is busy!\n"); | 246 | pr_err("SPORT is busy!\n"); |
247 | ret = -EBUSY; | 247 | ret = -EBUSY; |
@@ -303,14 +303,14 @@ static int __devinit bfin_tdm_probe(struct platform_device *pdev) | |||
303 | goto sport_config_err; | 303 | goto sport_config_err; |
304 | } | 304 | } |
305 | 305 | ||
306 | ret = sport_config_rx(sport_handle, IRFS, 0x1F, 0, 0); | 306 | ret = sport_config_rx(sport_handle, 0, 0x1F, 0, 0); |
307 | if (ret) { | 307 | if (ret) { |
308 | pr_err("SPORT is busy!\n"); | 308 | pr_err("SPORT is busy!\n"); |
309 | ret = -EBUSY; | 309 | ret = -EBUSY; |
310 | goto sport_config_err; | 310 | goto sport_config_err; |
311 | } | 311 | } |
312 | 312 | ||
313 | ret = sport_config_tx(sport_handle, ITFS, 0x1F, 0, 0); | 313 | ret = sport_config_tx(sport_handle, 0, 0x1F, 0, 0); |
314 | if (ret) { | 314 | if (ret) { |
315 | pr_err("SPORT is busy!\n"); | 315 | pr_err("SPORT is busy!\n"); |
316 | ret = -EBUSY; | 316 | ret = -EBUSY; |
diff --git a/sound/soc/codecs/cq93vc.c b/sound/soc/codecs/cq93vc.c index 46dbfd067f7..347a567b01e 100644 --- a/sound/soc/codecs/cq93vc.c +++ b/sound/soc/codecs/cq93vc.c | |||
@@ -153,7 +153,7 @@ static int cq93vc_resume(struct snd_soc_codec *codec) | |||
153 | 153 | ||
154 | static int cq93vc_probe(struct snd_soc_codec *codec) | 154 | static int cq93vc_probe(struct snd_soc_codec *codec) |
155 | { | 155 | { |
156 | struct davinci_vc *davinci_vc = codec->dev->platform_data; | 156 | struct davinci_vc *davinci_vc = snd_soc_codec_get_drvdata(codec); |
157 | 157 | ||
158 | davinci_vc->cq93vc.codec = codec; | 158 | davinci_vc->cq93vc.codec = codec; |
159 | codec->control_data = davinci_vc; | 159 | codec->control_data = davinci_vc; |
diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c index 03d1e860d22..bb4bf65b9e7 100644 --- a/sound/soc/codecs/cx20442.c +++ b/sound/soc/codecs/cx20442.c | |||
@@ -367,9 +367,12 @@ static int cx20442_codec_remove(struct snd_soc_codec *codec) | |||
367 | return 0; | 367 | return 0; |
368 | } | 368 | } |
369 | 369 | ||
370 | static const u8 cx20442_reg = CX20442_TELOUT | CX20442_MIC; | ||
371 | |||
370 | static struct snd_soc_codec_driver cx20442_codec_dev = { | 372 | static struct snd_soc_codec_driver cx20442_codec_dev = { |
371 | .probe = cx20442_codec_probe, | 373 | .probe = cx20442_codec_probe, |
372 | .remove = cx20442_codec_remove, | 374 | .remove = cx20442_codec_remove, |
375 | .reg_cache_default = &cx20442_reg, | ||
373 | .reg_cache_size = 1, | 376 | .reg_cache_size = 1, |
374 | .reg_word_size = sizeof(u8), | 377 | .reg_word_size = sizeof(u8), |
375 | .read = cx20442_read_reg_cache, | 378 | .read = cx20442_read_reg_cache, |
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 247a6a99feb..3351f77607b 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c | |||
@@ -2386,7 +2386,7 @@ static int wm8994_set_tristate(struct snd_soc_dai *codec_dai, int tristate) | |||
2386 | else | 2386 | else |
2387 | val = 0; | 2387 | val = 0; |
2388 | 2388 | ||
2389 | return snd_soc_update_bits(codec, reg, mask, reg); | 2389 | return snd_soc_update_bits(codec, reg, mask, val); |
2390 | } | 2390 | } |
2391 | 2391 | ||
2392 | #define WM8994_RATES SNDRV_PCM_RATE_8000_96000 | 2392 | #define WM8994_RATES SNDRV_PCM_RATE_8000_96000 |
diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c index 6045cbde492..608c84c5aa8 100644 --- a/sound/soc/codecs/wm8995.c +++ b/sound/soc/codecs/wm8995.c | |||
@@ -1223,7 +1223,7 @@ static int wm8995_set_tristate(struct snd_soc_dai *codec_dai, int tristate) | |||
1223 | else | 1223 | else |
1224 | val = 0; | 1224 | val = 0; |
1225 | 1225 | ||
1226 | return snd_soc_update_bits(codec, reg, mask, reg); | 1226 | return snd_soc_update_bits(codec, reg, mask, val); |
1227 | } | 1227 | } |
1228 | 1228 | ||
1229 | /* The size in bits of the FLL divide multiplied by 10 | 1229 | /* The size in bits of the FLL divide multiplied by 10 |
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c index c466982eed2..613df5db0b3 100644 --- a/sound/soc/codecs/wm_hubs.c +++ b/sound/soc/codecs/wm_hubs.c | |||
@@ -91,6 +91,7 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, unsigned int op) | |||
91 | static void calibrate_dc_servo(struct snd_soc_codec *codec) | 91 | static void calibrate_dc_servo(struct snd_soc_codec *codec) |
92 | { | 92 | { |
93 | struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); | 93 | struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); |
94 | s8 offset; | ||
94 | u16 reg, reg_l, reg_r, dcs_cfg; | 95 | u16 reg, reg_l, reg_r, dcs_cfg; |
95 | 96 | ||
96 | /* If we're using a digital only path and have a previously | 97 | /* 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) | |||
149 | hubs->dcs_codes); | 150 | hubs->dcs_codes); |
150 | 151 | ||
151 | /* HPOUT1L */ | 152 | /* HPOUT1L */ |
152 | if (reg_l + hubs->dcs_codes > 0 && | 153 | offset = reg_l; |
153 | reg_l + hubs->dcs_codes < 0xff) | 154 | offset += hubs->dcs_codes; |
154 | reg_l += hubs->dcs_codes; | 155 | dcs_cfg = (u8)offset << WM8993_DCS_DAC_WR_VAL_1_SHIFT; |
155 | dcs_cfg = reg_l << WM8993_DCS_DAC_WR_VAL_1_SHIFT; | ||
156 | 156 | ||
157 | /* HPOUT1R */ | 157 | /* HPOUT1R */ |
158 | if (reg_r + hubs->dcs_codes > 0 && | 158 | offset = reg_r; |
159 | reg_r + hubs->dcs_codes < 0xff) | 159 | offset += hubs->dcs_codes; |
160 | reg_r += hubs->dcs_codes; | 160 | dcs_cfg |= (u8)offset; |
161 | dcs_cfg |= reg_r; | ||
162 | 161 | ||
163 | dev_dbg(codec->dev, "DCS result: %x\n", dcs_cfg); | 162 | dev_dbg(codec->dev, "DCS result: %x\n", dcs_cfg); |
164 | 163 | ||
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index 0c2d6bacc68..b36f0b39b09 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c | |||
@@ -223,7 +223,7 @@ static struct snd_soc_dai_link da8xx_evm_dai = { | |||
223 | .stream_name = "AIC3X", | 223 | .stream_name = "AIC3X", |
224 | .cpu_dai_name= "davinci-mcasp.0", | 224 | .cpu_dai_name= "davinci-mcasp.0", |
225 | .codec_dai_name = "tlv320aic3x-hifi", | 225 | .codec_dai_name = "tlv320aic3x-hifi", |
226 | .codec_name = "tlv320aic3x-codec.0-001a", | 226 | .codec_name = "tlv320aic3x-codec.1-0018", |
227 | .platform_name = "davinci-pcm-audio", | 227 | .platform_name = "davinci-pcm-audio", |
228 | .init = evm_aic3x_init, | 228 | .init = evm_aic3x_init, |
229 | .ops = &evm_ops, | 229 | .ops = &evm_ops, |
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c index 2101bdcee21..3167be68962 100644 --- a/sound/soc/omap/ams-delta.c +++ b/sound/soc/omap/ams-delta.c | |||
@@ -507,8 +507,6 @@ static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd) | |||
507 | /* Set up digital mute if not provided by the codec */ | 507 | /* Set up digital mute if not provided by the codec */ |
508 | if (!codec_dai->driver->ops) { | 508 | if (!codec_dai->driver->ops) { |
509 | codec_dai->driver->ops = &ams_delta_dai_ops; | 509 | codec_dai->driver->ops = &ams_delta_dai_ops; |
510 | } else if (!codec_dai->driver->ops->digital_mute) { | ||
511 | codec_dai->driver->ops->digital_mute = ams_delta_digital_mute; | ||
512 | } else { | 510 | } else { |
513 | ams_delta_ops.startup = ams_delta_startup; | 511 | ams_delta_ops.startup = ams_delta_startup; |
514 | ams_delta_ops.shutdown = ams_delta_shutdown; | 512 | ams_delta_ops.shutdown = ams_delta_shutdown; |
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c index fc592f0d5fc..784cff5f67e 100644 --- a/sound/soc/pxa/corgi.c +++ b/sound/soc/pxa/corgi.c | |||
@@ -307,10 +307,10 @@ static int corgi_wm8731_init(struct snd_soc_pcm_runtime *rtd) | |||
307 | static struct snd_soc_dai_link corgi_dai = { | 307 | static struct snd_soc_dai_link corgi_dai = { |
308 | .name = "WM8731", | 308 | .name = "WM8731", |
309 | .stream_name = "WM8731", | 309 | .stream_name = "WM8731", |
310 | .cpu_dai_name = "pxa-is2-dai", | 310 | .cpu_dai_name = "pxa2xx-i2s", |
311 | .codec_dai_name = "wm8731-hifi", | 311 | .codec_dai_name = "wm8731-hifi", |
312 | .platform_name = "pxa-pcm-audio", | 312 | .platform_name = "pxa-pcm-audio", |
313 | .codec_name = "wm8731-codec-0.001a", | 313 | .codec_name = "wm8731-codec-0.001b", |
314 | .init = corgi_wm8731_init, | 314 | .init = corgi_wm8731_init, |
315 | .ops = &corgi_ops, | 315 | .ops = &corgi_ops, |
316 | }; | 316 | }; |
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index 6298ee115e2..a7d4999f9b2 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c | |||
@@ -276,7 +276,7 @@ static struct snd_soc_dai_link poodle_dai = { | |||
276 | .cpu_dai_name = "pxa2xx-i2s", | 276 | .cpu_dai_name = "pxa2xx-i2s", |
277 | .codec_dai_name = "wm8731-hifi", | 277 | .codec_dai_name = "wm8731-hifi", |
278 | .platform_name = "pxa-pcm-audio", | 278 | .platform_name = "pxa-pcm-audio", |
279 | .codec_name = "wm8731-codec.0-001a", | 279 | .codec_name = "wm8731-codec.0-001b", |
280 | .init = poodle_wm8731_init, | 280 | .init = poodle_wm8731_init, |
281 | .ops = &poodle_ops, | 281 | .ops = &poodle_ops, |
282 | }; | 282 | }; |
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index c2acb69b957..8e157135063 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c | |||
@@ -315,10 +315,10 @@ static int spitz_wm8750_init(struct snd_soc_pcm_runtime *rtd) | |||
315 | static struct snd_soc_dai_link spitz_dai = { | 315 | static struct snd_soc_dai_link spitz_dai = { |
316 | .name = "wm8750", | 316 | .name = "wm8750", |
317 | .stream_name = "WM8750", | 317 | .stream_name = "WM8750", |
318 | .cpu_dai_name = "pxa-is2", | 318 | .cpu_dai_name = "pxa2xx-i2s", |
319 | .codec_dai_name = "wm8750-hifi", | 319 | .codec_dai_name = "wm8750-hifi", |
320 | .platform_name = "pxa-pcm-audio", | 320 | .platform_name = "pxa-pcm-audio", |
321 | .codec_name = "wm8750-codec.0-001a", | 321 | .codec_name = "wm8750-codec.0-001b", |
322 | .init = spitz_wm8750_init, | 322 | .init = spitz_wm8750_init, |
323 | .ops = &spitz_ops, | 323 | .ops = &spitz_ops, |
324 | }; | 324 | }; |
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c index 2d4f896d7fe..3ceaef68e01 100644 --- a/sound/soc/pxa/z2.c +++ b/sound/soc/pxa/z2.c | |||
@@ -104,6 +104,7 @@ static struct snd_soc_jack_gpio hs_jack_gpios[] = { | |||
104 | .name = "hsdet-gpio", | 104 | .name = "hsdet-gpio", |
105 | .report = SND_JACK_HEADSET, | 105 | .report = SND_JACK_HEADSET, |
106 | .debounce_time = 200, | 106 | .debounce_time = 200, |
107 | .invert = 1, | ||
107 | }, | 108 | }, |
108 | }; | 109 | }; |
109 | 110 | ||
@@ -192,7 +193,7 @@ static struct snd_soc_dai_link z2_dai = { | |||
192 | .cpu_dai_name = "pxa2xx-i2s", | 193 | .cpu_dai_name = "pxa2xx-i2s", |
193 | .codec_dai_name = "wm8750-hifi", | 194 | .codec_dai_name = "wm8750-hifi", |
194 | .platform_name = "pxa-pcm-audio", | 195 | .platform_name = "pxa-pcm-audio", |
195 | .codec_name = "wm8750-codec.0-001a", | 196 | .codec_name = "wm8750-codec.0-001b", |
196 | .init = z2_wm8750_init, | 197 | .init = z2_wm8750_init, |
197 | .ops = &z2_ops, | 198 | .ops = &z2_ops, |
198 | }; | 199 | }; |
diff --git a/sound/soc/samsung/neo1973_gta02_wm8753.c b/sound/soc/samsung/neo1973_gta02_wm8753.c index 3eec610c10f..0d0ae2b9eef 100644 --- a/sound/soc/samsung/neo1973_gta02_wm8753.c +++ b/sound/soc/samsung/neo1973_gta02_wm8753.c | |||
@@ -397,11 +397,11 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = { | |||
397 | { /* Hifi Playback - for similatious use with voice below */ | 397 | { /* Hifi Playback - for similatious use with voice below */ |
398 | .name = "WM8753", | 398 | .name = "WM8753", |
399 | .stream_name = "WM8753 HiFi", | 399 | .stream_name = "WM8753 HiFi", |
400 | .cpu_dai_name = "s3c24xx-i2s", | 400 | .cpu_dai_name = "s3c24xx-iis", |
401 | .codec_dai_name = "wm8753-hifi", | 401 | .codec_dai_name = "wm8753-hifi", |
402 | .init = neo1973_gta02_wm8753_init, | 402 | .init = neo1973_gta02_wm8753_init, |
403 | .platform_name = "samsung-audio", | 403 | .platform_name = "samsung-audio", |
404 | .codec_name = "wm8753-codec.0-0x1a", | 404 | .codec_name = "wm8753-codec.0-001a", |
405 | .ops = &neo1973_gta02_hifi_ops, | 405 | .ops = &neo1973_gta02_hifi_ops, |
406 | }, | 406 | }, |
407 | { /* Voice via BT */ | 407 | { /* Voice via BT */ |
@@ -410,7 +410,7 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = { | |||
410 | .cpu_dai_name = "bluetooth-dai", | 410 | .cpu_dai_name = "bluetooth-dai", |
411 | .codec_dai_name = "wm8753-voice", | 411 | .codec_dai_name = "wm8753-voice", |
412 | .ops = &neo1973_gta02_voice_ops, | 412 | .ops = &neo1973_gta02_voice_ops, |
413 | .codec_name = "wm8753-codec.0-0x1a", | 413 | .codec_name = "wm8753-codec.0-001a", |
414 | .platform_name = "samsung-audio", | 414 | .platform_name = "samsung-audio", |
415 | }, | 415 | }, |
416 | }; | 416 | }; |
diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c index c7a24514beb..d20815d5ab2 100644 --- a/sound/soc/samsung/neo1973_wm8753.c +++ b/sound/soc/samsung/neo1973_wm8753.c | |||
@@ -559,9 +559,9 @@ static struct snd_soc_dai_link neo1973_dai[] = { | |||
559 | .name = "WM8753", | 559 | .name = "WM8753", |
560 | .stream_name = "WM8753 HiFi", | 560 | .stream_name = "WM8753 HiFi", |
561 | .platform_name = "samsung-audio", | 561 | .platform_name = "samsung-audio", |
562 | .cpu_dai_name = "s3c24xx-i2s", | 562 | .cpu_dai_name = "s3c24xx-iis", |
563 | .codec_dai_name = "wm8753-hifi", | 563 | .codec_dai_name = "wm8753-hifi", |
564 | .codec_name = "wm8753-codec.0-0x1a", | 564 | .codec_name = "wm8753-codec.0-001a", |
565 | .init = neo1973_wm8753_init, | 565 | .init = neo1973_wm8753_init, |
566 | .ops = &neo1973_hifi_ops, | 566 | .ops = &neo1973_hifi_ops, |
567 | }, | 567 | }, |
@@ -571,7 +571,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { | |||
571 | .platform_name = "samsung-audio", | 571 | .platform_name = "samsung-audio", |
572 | .cpu_dai_name = "bluetooth-dai", | 572 | .cpu_dai_name = "bluetooth-dai", |
573 | .codec_dai_name = "wm8753-voice", | 573 | .codec_dai_name = "wm8753-voice", |
574 | .codec_name = "wm8753-codec.0-0x1a", | 574 | .codec_name = "wm8753-codec.0-001a", |
575 | .ops = &neo1973_voice_ops, | 575 | .ops = &neo1973_voice_ops, |
576 | }, | 576 | }, |
577 | }; | 577 | }; |
diff --git a/sound/soc/samsung/s3c24xx_simtec_hermes.c b/sound/soc/samsung/s3c24xx_simtec_hermes.c index bb4292e3596..08fcaaa6690 100644 --- a/sound/soc/samsung/s3c24xx_simtec_hermes.c +++ b/sound/soc/samsung/s3c24xx_simtec_hermes.c | |||
@@ -94,8 +94,8 @@ static int simtec_hermes_init(struct snd_soc_pcm_runtime *rtd) | |||
94 | static struct snd_soc_dai_link simtec_dai_aic33 = { | 94 | static struct snd_soc_dai_link simtec_dai_aic33 = { |
95 | .name = "tlv320aic33", | 95 | .name = "tlv320aic33", |
96 | .stream_name = "TLV320AIC33", | 96 | .stream_name = "TLV320AIC33", |
97 | .codec_name = "tlv320aic3x-codec.0-0x1a", | 97 | .codec_name = "tlv320aic3x-codec.0-001a", |
98 | .cpu_dai_name = "s3c24xx-i2s", | 98 | .cpu_dai_name = "s3c24xx-iis", |
99 | .codec_dai_name = "tlv320aic3x-hifi", | 99 | .codec_dai_name = "tlv320aic3x-hifi", |
100 | .platform_name = "samsung-audio", | 100 | .platform_name = "samsung-audio", |
101 | .init = simtec_hermes_init, | 101 | .init = simtec_hermes_init, |
diff --git a/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c b/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c index fbba4e36772..116e3e67016 100644 --- a/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c +++ b/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | |||
@@ -85,8 +85,8 @@ static int simtec_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd) | |||
85 | static struct snd_soc_dai_link simtec_dai_aic23 = { | 85 | static struct snd_soc_dai_link simtec_dai_aic23 = { |
86 | .name = "tlv320aic23", | 86 | .name = "tlv320aic23", |
87 | .stream_name = "TLV320AIC23", | 87 | .stream_name = "TLV320AIC23", |
88 | .codec_name = "tlv320aic3x-codec.0-0x1a", | 88 | .codec_name = "tlv320aic3x-codec.0-001a", |
89 | .cpu_dai_name = "s3c24xx-i2s", | 89 | .cpu_dai_name = "s3c24xx-iis", |
90 | .codec_dai_name = "tlv320aic3x-hifi", | 90 | .codec_dai_name = "tlv320aic3x-hifi", |
91 | .platform_name = "samsung-audio", | 91 | .platform_name = "samsung-audio", |
92 | .init = simtec_tlv320aic23_init, | 92 | .init = simtec_tlv320aic23_init, |
diff --git a/sound/soc/samsung/s3c24xx_uda134x.c b/sound/soc/samsung/s3c24xx_uda134x.c index cdc8ecbcb8e..2c09e93dd56 100644 --- a/sound/soc/samsung/s3c24xx_uda134x.c +++ b/sound/soc/samsung/s3c24xx_uda134x.c | |||
@@ -228,7 +228,7 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = { | |||
228 | .stream_name = "UDA134X", | 228 | .stream_name = "UDA134X", |
229 | .codec_name = "uda134x-hifi", | 229 | .codec_name = "uda134x-hifi", |
230 | .codec_dai_name = "uda134x-hifi", | 230 | .codec_dai_name = "uda134x-hifi", |
231 | .cpu_dai_name = "s3c24xx-i2s", | 231 | .cpu_dai_name = "s3c24xx-iis", |
232 | .ops = &s3c24xx_uda134x_ops, | 232 | .ops = &s3c24xx_uda134x_ops, |
233 | .platform_name = "samsung-audio", | 233 | .platform_name = "samsung-audio", |
234 | }; | 234 | }; |
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index bac7291b6ff..c4b60610beb 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
@@ -1664,9 +1664,6 @@ static int soc_probe_aux_dev(struct snd_soc_card *card, int num) | |||
1664 | goto out; | 1664 | goto out; |
1665 | 1665 | ||
1666 | found: | 1666 | found: |
1667 | if (!try_module_get(codec->dev->driver->owner)) | ||
1668 | return -ENODEV; | ||
1669 | |||
1670 | ret = soc_probe_codec(card, codec); | 1667 | ret = soc_probe_codec(card, codec); |
1671 | if (ret < 0) | 1668 | if (ret < 0) |
1672 | return ret; | 1669 | return ret; |
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 499730ab563..8194f150bab 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c | |||
@@ -1742,7 +1742,7 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, | |||
1742 | int max = mc->max; | 1742 | int max = mc->max; |
1743 | unsigned int mask = (1 << fls(max)) - 1; | 1743 | unsigned int mask = (1 << fls(max)) - 1; |
1744 | unsigned int invert = mc->invert; | 1744 | unsigned int invert = mc->invert; |
1745 | unsigned int val, val_mask; | 1745 | unsigned int val; |
1746 | int connect, change; | 1746 | int connect, change; |
1747 | struct snd_soc_dapm_update update; | 1747 | struct snd_soc_dapm_update update; |
1748 | 1748 | ||
@@ -1750,13 +1750,13 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, | |||
1750 | 1750 | ||
1751 | if (invert) | 1751 | if (invert) |
1752 | val = max - val; | 1752 | val = max - val; |
1753 | val_mask = mask << shift; | 1753 | mask = mask << shift; |
1754 | val = val << shift; | 1754 | val = val << shift; |
1755 | 1755 | ||
1756 | mutex_lock(&widget->codec->mutex); | 1756 | mutex_lock(&widget->codec->mutex); |
1757 | widget->value = val; | 1757 | widget->value = val; |
1758 | 1758 | ||
1759 | change = snd_soc_test_bits(widget->codec, reg, val_mask, val); | 1759 | change = snd_soc_test_bits(widget->codec, reg, mask, val); |
1760 | if (change) { | 1760 | if (change) { |
1761 | if (val) | 1761 | if (val) |
1762 | /* new connection */ | 1762 | /* new connection */ |