diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-29 18:31:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-29 18:31:57 -0400 |
commit | 52b0ace7dfe8f70350218017a95d7cab1eb41fbb (patch) | |
tree | e474f8e2c5ac1712e1e1155b879420dde4aa3922 /sound/soc | |
parent | 24010e460454ec0d2f4f0213b667b4349cbdb8e1 (diff) | |
parent | d6695f09ea30de712662fcf8dd0e8c4d4306a15a (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (26 commits)
ALSA: snd-usb-caiaq: Bump version number to 1.3.21
ALSA: Revert "ALSA: snd-usb-caiaq: Set default input mode of A4DJ"
ALSA: snd-usb-caiaq: Simplify single case to an 'if'
ALSA: snd-usb-caiaq: Restore 'Control vinyl' input mode on A4DJ
ALSA: hda: Use LPIB for a Shuttle device
ALSA: hda: Add support for another Lenovo ThinkPad Edge in conexant codec
ALSA: hda: Use LPIB for Sony VPCS11V9E
ALSA: usb-audio: fix feature unit parser for UAC2
ALSA: asihpi - Minor code cleanup
ALSA: asihpi - Add support for new ASI8800 family
ALSA: asihpi - Fix bug preventing outstream_write preload from happening
ALSA: asihpi - Fix imbalanced lock path in hw_message
ALSA: asihpi - Remove support for old ASI8800 family
ALSA: asihpi - Add hd radio blend functions
ALSA: asihpi - Remove unused io map functions
ALSA: usb-audio: add support for UAC2 pitch control
ALSA: usb-audio: parse UAC2 endpoint descriptors correctly
ALSA: usb-audio: fix return values
ALSA: usb-audio: parse more format descriptors with structs
sound: Add missing spin_unlock
...
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/wm8350.c | 4 | ||||
-rw-r--r-- | sound/soc/codecs/wm8400.c | 18 | ||||
-rw-r--r-- | sound/soc/codecs/wm8990.c | 18 | ||||
-rw-r--r-- | sound/soc/imx/imx-pcm-dma-mx2.c | 7 | ||||
-rw-r--r-- | sound/soc/sh/siu_dai.c | 2 |
5 files changed, 26 insertions, 23 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index 8ae20208e7be..0221ca79b3ae 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c | |||
@@ -426,8 +426,8 @@ static const struct soc_enum wm8350_enum[] = { | |||
426 | SOC_ENUM_SINGLE(WM8350_INPUT_MIXER_VOLUME, 15, 2, wm8350_lr), | 426 | SOC_ENUM_SINGLE(WM8350_INPUT_MIXER_VOLUME, 15, 2, wm8350_lr), |
427 | }; | 427 | }; |
428 | 428 | ||
429 | static DECLARE_TLV_DB_LINEAR(pre_amp_tlv, -1200, 3525); | 429 | static DECLARE_TLV_DB_SCALE(pre_amp_tlv, -1200, 3525, 0); |
430 | static DECLARE_TLV_DB_LINEAR(out_pga_tlv, -5700, 600); | 430 | static DECLARE_TLV_DB_SCALE(out_pga_tlv, -5700, 600, 0); |
431 | static DECLARE_TLV_DB_SCALE(dac_pcm_tlv, -7163, 36, 1); | 431 | static DECLARE_TLV_DB_SCALE(dac_pcm_tlv, -7163, 36, 1); |
432 | static DECLARE_TLV_DB_SCALE(adc_pcm_tlv, -12700, 50, 1); | 432 | static DECLARE_TLV_DB_SCALE(adc_pcm_tlv, -12700, 50, 1); |
433 | static DECLARE_TLV_DB_SCALE(out_mix_tlv, -1500, 300, 1); | 433 | static DECLARE_TLV_DB_SCALE(out_mix_tlv, -1500, 300, 1); |
diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c index 7f5d080536a0..8f294066b0ed 100644 --- a/sound/soc/codecs/wm8400.c +++ b/sound/soc/codecs/wm8400.c | |||
@@ -107,21 +107,21 @@ static void wm8400_codec_reset(struct snd_soc_codec *codec) | |||
107 | wm8400_reset_codec_reg_cache(wm8400->wm8400); | 107 | wm8400_reset_codec_reg_cache(wm8400->wm8400); |
108 | } | 108 | } |
109 | 109 | ||
110 | static const DECLARE_TLV_DB_LINEAR(rec_mix_tlv, -1500, 600); | 110 | static const DECLARE_TLV_DB_SCALE(rec_mix_tlv, -1500, 600, 0); |
111 | 111 | ||
112 | static const DECLARE_TLV_DB_LINEAR(in_pga_tlv, -1650, 3000); | 112 | static const DECLARE_TLV_DB_SCALE(in_pga_tlv, -1650, 3000, 0); |
113 | 113 | ||
114 | static const DECLARE_TLV_DB_LINEAR(out_mix_tlv, -2100, 0); | 114 | static const DECLARE_TLV_DB_SCALE(out_mix_tlv, -2100, 0, 0); |
115 | 115 | ||
116 | static const DECLARE_TLV_DB_LINEAR(out_pga_tlv, -7300, 600); | 116 | static const DECLARE_TLV_DB_SCALE(out_pga_tlv, -7300, 600, 0); |
117 | 117 | ||
118 | static const DECLARE_TLV_DB_LINEAR(out_omix_tlv, -600, 0); | 118 | static const DECLARE_TLV_DB_SCALE(out_omix_tlv, -600, 0, 0); |
119 | 119 | ||
120 | static const DECLARE_TLV_DB_LINEAR(out_dac_tlv, -7163, 0); | 120 | static const DECLARE_TLV_DB_SCALE(out_dac_tlv, -7163, 0, 0); |
121 | 121 | ||
122 | static const DECLARE_TLV_DB_LINEAR(in_adc_tlv, -7163, 1763); | 122 | static const DECLARE_TLV_DB_SCALE(in_adc_tlv, -7163, 1763, 0); |
123 | 123 | ||
124 | static const DECLARE_TLV_DB_LINEAR(out_sidetone_tlv, -3600, 0); | 124 | static const DECLARE_TLV_DB_SCALE(out_sidetone_tlv, -3600, 0, 0); |
125 | 125 | ||
126 | static int wm8400_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol, | 126 | static int wm8400_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol, |
127 | struct snd_ctl_elem_value *ucontrol) | 127 | struct snd_ctl_elem_value *ucontrol) |
@@ -440,7 +440,7 @@ static int outmixer_event (struct snd_soc_dapm_widget *w, | |||
440 | /* INMIX dB values */ | 440 | /* INMIX dB values */ |
441 | static const unsigned int in_mix_tlv[] = { | 441 | static const unsigned int in_mix_tlv[] = { |
442 | TLV_DB_RANGE_HEAD(1), | 442 | TLV_DB_RANGE_HEAD(1), |
443 | 0,7, TLV_DB_LINEAR_ITEM(-1200, 600), | 443 | 0,7, TLV_DB_SCALE_ITEM(-1200, 600, 0), |
444 | }; | 444 | }; |
445 | 445 | ||
446 | /* Left In PGA Connections */ | 446 | /* Left In PGA Connections */ |
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c index 7b536d923ea9..c018772cc430 100644 --- a/sound/soc/codecs/wm8990.c +++ b/sound/soc/codecs/wm8990.c | |||
@@ -111,21 +111,21 @@ static const u16 wm8990_reg[] = { | |||
111 | 111 | ||
112 | #define wm8990_reset(c) snd_soc_write(c, WM8990_RESET, 0) | 112 | #define wm8990_reset(c) snd_soc_write(c, WM8990_RESET, 0) |
113 | 113 | ||
114 | static const DECLARE_TLV_DB_LINEAR(rec_mix_tlv, -1500, 600); | 114 | static const DECLARE_TLV_DB_SCALE(rec_mix_tlv, -1500, 600, 0); |
115 | 115 | ||
116 | static const DECLARE_TLV_DB_LINEAR(in_pga_tlv, -1650, 3000); | 116 | static const DECLARE_TLV_DB_SCALE(in_pga_tlv, -1650, 3000, 0); |
117 | 117 | ||
118 | static const DECLARE_TLV_DB_LINEAR(out_mix_tlv, 0, -2100); | 118 | static const DECLARE_TLV_DB_SCALE(out_mix_tlv, 0, -2100, 0); |
119 | 119 | ||
120 | static const DECLARE_TLV_DB_LINEAR(out_pga_tlv, -7300, 600); | 120 | static const DECLARE_TLV_DB_SCALE(out_pga_tlv, -7300, 600, 0); |
121 | 121 | ||
122 | static const DECLARE_TLV_DB_LINEAR(out_omix_tlv, -600, 0); | 122 | static const DECLARE_TLV_DB_SCALE(out_omix_tlv, -600, 0, 0); |
123 | 123 | ||
124 | static const DECLARE_TLV_DB_LINEAR(out_dac_tlv, -7163, 0); | 124 | static const DECLARE_TLV_DB_SCALE(out_dac_tlv, -7163, 0, 0); |
125 | 125 | ||
126 | static const DECLARE_TLV_DB_LINEAR(in_adc_tlv, -7163, 1763); | 126 | static const DECLARE_TLV_DB_SCALE(in_adc_tlv, -7163, 1763, 0); |
127 | 127 | ||
128 | static const DECLARE_TLV_DB_LINEAR(out_sidetone_tlv, -3600, 0); | 128 | static const DECLARE_TLV_DB_SCALE(out_sidetone_tlv, -3600, 0, 0); |
129 | 129 | ||
130 | static int wm899x_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol, | 130 | static int wm899x_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol, |
131 | struct snd_ctl_elem_value *ucontrol) | 131 | struct snd_ctl_elem_value *ucontrol) |
@@ -451,7 +451,7 @@ static int outmixer_event(struct snd_soc_dapm_widget *w, | |||
451 | /* INMIX dB values */ | 451 | /* INMIX dB values */ |
452 | static const unsigned int in_mix_tlv[] = { | 452 | static const unsigned int in_mix_tlv[] = { |
453 | TLV_DB_RANGE_HEAD(1), | 453 | TLV_DB_RANGE_HEAD(1), |
454 | 0, 7, TLV_DB_LINEAR_ITEM(-1200, 600), | 454 | 0, 7, TLV_DB_SCALE_ITEM(-1200, 600, 0), |
455 | }; | 455 | }; |
456 | 456 | ||
457 | /* Left In PGA Connections */ | 457 | /* Left In PGA Connections */ |
diff --git a/sound/soc/imx/imx-pcm-dma-mx2.c b/sound/soc/imx/imx-pcm-dma-mx2.c index 2b31ac673ea4..05f19c9284f4 100644 --- a/sound/soc/imx/imx-pcm-dma-mx2.c +++ b/sound/soc/imx/imx-pcm-dma-mx2.c | |||
@@ -73,7 +73,8 @@ static void snd_imx_dma_err_callback(int channel, void *data, int err) | |||
73 | { | 73 | { |
74 | struct snd_pcm_substream *substream = data; | 74 | struct snd_pcm_substream *substream = data; |
75 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 75 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
76 | struct imx_pcm_dma_params *dma_params = rtd->dai->cpu_dai->dma_data; | 76 | struct imx_pcm_dma_params *dma_params = |
77 | snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream); | ||
77 | struct snd_pcm_runtime *runtime = substream->runtime; | 78 | struct snd_pcm_runtime *runtime = substream->runtime; |
78 | struct imx_pcm_runtime_data *iprtd = runtime->private_data; | 79 | struct imx_pcm_runtime_data *iprtd = runtime->private_data; |
79 | int ret; | 80 | int ret; |
@@ -102,7 +103,7 @@ static int imx_ssi_dma_alloc(struct snd_pcm_substream *substream) | |||
102 | struct imx_pcm_runtime_data *iprtd = runtime->private_data; | 103 | struct imx_pcm_runtime_data *iprtd = runtime->private_data; |
103 | int ret; | 104 | int ret; |
104 | 105 | ||
105 | dma_params = snd_soc_get_dma_data(rtd->dai->cpu_dai, substream); | 106 | dma_params = snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream); |
106 | 107 | ||
107 | iprtd->dma = imx_dma_request_by_prio(DRV_NAME, DMA_PRIO_HIGH); | 108 | iprtd->dma = imx_dma_request_by_prio(DRV_NAME, DMA_PRIO_HIGH); |
108 | if (iprtd->dma < 0) { | 109 | if (iprtd->dma < 0) { |
@@ -212,7 +213,7 @@ static int snd_imx_pcm_prepare(struct snd_pcm_substream *substream) | |||
212 | struct imx_pcm_runtime_data *iprtd = runtime->private_data; | 213 | struct imx_pcm_runtime_data *iprtd = runtime->private_data; |
213 | int err; | 214 | int err; |
214 | 215 | ||
215 | dma_params = snd_soc_get_dma_data(rtd->dai->cpu_dai, substream); | 216 | dma_params = snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream); |
216 | 217 | ||
217 | iprtd->substream = substream; | 218 | iprtd->substream = substream; |
218 | iprtd->buf = (unsigned int *)substream->dma_buffer.area; | 219 | iprtd->buf = (unsigned int *)substream->dma_buffer.area; |
diff --git a/sound/soc/sh/siu_dai.c b/sound/soc/sh/siu_dai.c index d86ee1bfc03a..eeed5edd722b 100644 --- a/sound/soc/sh/siu_dai.c +++ b/sound/soc/sh/siu_dai.c | |||
@@ -588,6 +588,8 @@ static int siu_dai_prepare(struct snd_pcm_substream *substream, | |||
588 | ret = siu_dai_spbstart(port_info); | 588 | ret = siu_dai_spbstart(port_info); |
589 | if (ret < 0) | 589 | if (ret < 0) |
590 | goto fail; | 590 | goto fail; |
591 | } else { | ||
592 | ret = 0; | ||
591 | } | 593 | } |
592 | 594 | ||
593 | port_info->play_cap |= self; | 595 | port_info->play_cap |= self; |