sound fixes for 2.6.33-rc1
Subsystems (5)
Linus,
please pull sound fixes for v2.6.33-rc1 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
This contains the following, mostly trivial fixes since the last merge.
Thanks!
Takashi
===
Alexey Fisher (1):
ALSA: document: Add direct git link to grub hda-analyzer
David Santinoli (1):
ALSA: hda/realtek: quirk for D945GCLF2 mainboard
Jaroslav Kysela (2):
ALSA: hda - Terradici HDA controllers does not support 64-bit mode
ALSA: ice1724 - aureon - modify WM8770 Master & DAC volume
Justin P. Mattock (1):
ALSA: hda - iMac 9,1 sound patch.
Krzysztof Helt (1):
ALSA: opti93x: set MC indirect registers base from PnP data
Randy Dunlap (1):
ALSA: radio/sound/miro: fix build, cleanup depends/selects
Roel Kluin (1):
ASoC: Wrong variable returned on error
Takashi Iwai (3):
ALSA: hda - Add missing Line-Out and PCM switches as slave
ALSA: hda - Exclude unusable ADCs for ALC88x
ALSA: hda - Generalize EAPD inversion check in patch_analog.c
Tobias Hansen (1):
ALSA: snd-usb-us122l: add product IDs of US-122MKII and US-144MKII
--- Documentation/sound/alsa/HD-Audio-Models.txt | 1 + Documentation/sound/alsa/HD-Audio.txt | 6 +- drivers/media/radio/Kconfig | 3 +- sound/isa/opti9xx/opti92x-ad1848.c | 112 ++++++++++++++--------- sound/pci/hda/hda_intel.c | 5 + sound/pci/hda/patch_analog.c | 17 ++-- sound/pci/hda/patch_realtek.c | 127 +++++++++++++++++++++++++- sound/pci/ice1712/aureon.c | 31 ++----- sound/soc/imx/mx1_mx2-pcm.c | 6 +- sound/usb/usx2y/us122l.c | 28 +++++- sound/usb/usx2y/us122l.h | 2 + 11 files changed, 248 insertions(+), 90 deletions(-)
Documentation/sound/alsa/HD-Audio-Models.txt +1 -0
@@ -126,6 +126,7 @@ ALC882/883/885/888/889 mb5 Macbook 5,1 mbp3 Macbook Pro rev3 imac24 iMac 24'' with jack detection + imac91 iMac 9,1 w2jc ASUS W2JC 3stack-2ch-dig 3-jack with SPDIF I/O (ALC883) alc883-6stack-dig 6-jack digital with SPDIF I/O (ALC883)
Documentation/sound/alsa/HD-Audio.txt +4 -2
@@ -624,11 +624,13 @@ hda-verb. The program gives you an easy-to-use GUI stuff for showing the widget information and adjusting the amp values, as well as the proc-compatible output. -The hda-analyzer is a part of alsa.git repository in -alsa-project.org: +The hda-analyzer: - http://git.alsa-project.org/?p=alsa.git;a=tree;f=hda-analyzer +is a part of alsa.git repository in alsa-project.org: + +- git://git.alsa-project.org/alsa.git Codecgraph ~~~~~~~~~~
drivers/media/radio/Kconfig +2 -1
@@ -197,7 +197,8 @@ config RADIO_MAESTRO config RADIO_MIROPCM20 tristate "miroSOUND PCM20 radio" - depends on ISA && VIDEO_V4L2 + depends on ISA && VIDEO_V4L2 && SND + select SND_ISA select SND_MIRO ---help--- Choose Y here if you have this FM radio card. You also need to enable
sound/isa/opti9xx/opti92x-ad1848.c +67 -45
173 lines not on this page · raw message
sound/pci/hda/hda_intel.c +5 -0
@@ -2450,6 +2450,11 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci, } } +/* disable 64bit DMA address for Teradici */ +/* it does not work with device 6549:1200 subsys e4a2:040b */ +if (chip->driver_type ==AZX_DRIVER_TERA ) + gcap &= ~ICH6_GCAP_64OK ; +/* allow 64bit DMA address if supported by H/W */ if ((gcap &ICH6_GCAP_64OK ) && !pci_set_dma_mask (pci,DMA_BIT_MASK (64 )))pci_set_consistent_dma_mask (pci,DMA_BIT_MASK (64 ));
sound/pci/hda/patch_analog.c +9 -8
@@ -72,7 +72,8 @@ struct ad198x_spec {hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS ]; unsigned int jack_present :1; - unsigned int inv_jack_detect:1; + unsigned int inv_jack_detect:1; /* inverted jack-detection */ + unsigned int inv_eapd:1; /* inverted EAPD implementation */#ifdef CONFIG_SND_HDA_POWER_SAVE struct hda_loopback_check loopback;
@@ -458,7 +459,7 @@ static struct hda_codec_ops ad198x_patch_ops = {/* * EAPD control -* the private value = nid | (invert << 8) +* the private value = nid */ #define ad198x_eapd_info snd_ctl_boolean_mono_info
@@ -467,8 +468,7 @@ static int ad198x_eapd_get(struct snd_kcontrol *kcontrol, {struct hda_codec *codec =snd_kcontrol_chip (kcontrol);struct ad198x_spec *spec = codec->spec; -int invert = (kcontrol->private_value >>8 ) &1 ; -if (invert) +if (spec->inv_eapd) ucontrol->value.integer.value[0 ] = ! spec->cur_eapd;else ucontrol->value.integer.value[0 ] = spec->cur_eapd;
@@ -480,11 +480,10 @@ static int ad198x_eapd_put(struct snd_kcontrol *kcontrol, {struct hda_codec *codec =snd_kcontrol_chip (kcontrol);struct ad198x_spec *spec = codec->spec; -int invert = (kcontrol->private_value >>8 ) &1 ;hda_nid_t nid = kcontrol->private_value &0xff ;unsigned int eapd; eapd = !!ucontrol->value.integer.value[0 ]; -if (invert) +if (spec->inv_eapd) eapd = !eapd;if (eapd == spec->cur_eapd)return 0 ;
@@ -705,7 +704,7 @@ static struct snd_kcontrol_new ad1986a_laptop_eapd_mixers[] = { .info = ad198x_eapd_info, .get = ad198x_eapd_get, .put = ad198x_eapd_put, - .private_value = 0x1b | (1 << 8), /* port-D, inversed */ + .private_value = 0x1b, /* port-D */ }, { }/* end */ };
@@ -1074,6 +1073,7 @@ static int patch_ad1986a(struct hda_codec *codec) spec->loopback.amplist = ad1986a_loopbacks;#endif spec->vmaster_nid =0x1b ; + spec->inv_eapd =1 ;/* AD1986A has the inverted EAPD implementation */ codec->patch_ops = ad198x_patch_ops;
@@ -2124,7 +2124,7 @@ static struct snd_kcontrol_new ad1988_laptop_mixers[] = { .info = ad198x_eapd_info, .get = ad198x_eapd_get, .put = ad198x_eapd_put, - .private_value = 0x12 | (1 << 8), /* port-D, inversed */ + .private_value = 0x12, /* port-D */ }, { }/* end */
@@ -3065,6 +3065,7 @@ static int patch_ad1988(struct hda_codec *codec) spec->input_mux = &ad1988_laptop_capture_source; spec->num_mixers =1 ; spec->mixers[0 ] = ad1988_laptop_mixers; + spec->inv_eapd =1 ;/* inverted EAPD */ spec->num_init_verbs =1 ; spec->init_verbs[0 ] = ad1988_laptop_init_verbs;if (board_config ==AD1988_LAPTOP_DIG )
sound/pci/hda/patch_realtek.c +126 -1
196 lines not on this page · raw message
sound/pci/ice1712/aureon.c +7 -24
@@ -689,32 +689,14 @@ static int aureon_ac97_mmute_put(struct snd_kcontrol *kcontrol, struct snd_ctl_ereturn change; } -static const DECLARE_TLV_DB_SCALE(db_scale_wm_dac, -12700, 100, 1); +static const DECLARE_TLV_DB_SCALE(db_scale_wm_dac, -10000, 100, 1); static const DECLARE_TLV_DB_SCALE(db_scale_wm_pcm, -6400, 50, 1); static const DECLARE_TLV_DB_SCALE(db_scale_wm_adc, -1200, 100, 0); static const DECLARE_TLV_DB_SCALE(db_scale_ac97_master, -4650, 150, 0); static const DECLARE_TLV_DB_SCALE(db_scale_ac97_gain, -3450, 150, 0); -/* -* Logarithmic volume values for WM8770 -* Computed as 20 * Log10(255 / x) -*/ -static const unsigned char wm_vol[256 ] = { -127 ,48 ,42 ,39 ,36 ,34 ,33 ,31 ,30 ,29 ,28 ,27 ,27 ,26 ,25 ,25 ,24 ,24 ,23 , -23 ,22 ,22 ,21 ,21 ,21 ,20 ,20 ,20 ,19 ,19 ,19 ,18 ,18 ,18 ,18 ,17 ,17 ,17 , -17 ,16 ,16 ,16 ,16 ,15 ,15 ,15 ,15 ,15 ,15 ,14 ,14 ,14 ,14 ,14 ,13 ,13 ,13 , -13 ,13 ,13 ,13 ,12 ,12 ,12 ,12 ,12 ,12 ,12 ,11 ,11 ,11 ,11 ,11 ,11 ,11 ,11 , -11 ,10 ,10 ,10 ,10 ,10 ,10 ,10 ,10 ,10 ,9 ,9 ,9 ,9 ,9 ,9 ,9 ,9 ,9 ,9 ,8 ,8 , -8 ,8 ,8 ,8 ,8 ,8 ,8 ,8 ,8 ,8 ,7 ,7 ,7 ,7 ,7 ,7 ,7 ,7 ,7 ,7 ,7 ,7 ,7 ,6 ,6 ,6 , -6 ,6 ,6 ,6 ,6 ,6 ,6 ,6 ,6 ,6 ,6 ,6 ,5 ,5 ,5 ,5 ,5 ,5 ,5 ,5 ,5 ,5 ,5 ,5 ,5 ,5 , -5 ,5 ,4 ,4 ,4 ,4 ,4 ,4 ,4 ,4 ,4 ,4 ,4 ,4 ,4 ,4 ,4 ,4 ,4 ,4 ,4 ,3 ,3 ,3 ,3 ,3 , -3 ,3 ,3 ,3 ,3 ,3 ,3 ,3 ,3 ,3 ,3 ,3 ,3 ,3 ,3 ,3 ,2 ,2 ,2 ,2 ,2 ,2 ,2 ,2 ,2 ,2 , -2 ,2 ,2 ,2 ,2 ,2 ,2 ,2 ,2 ,2 ,2 ,2 ,2 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 , -1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , -0 ,0 -}; - -#define WM_VOL_MAX (sizeof(wm_vol) - 1) +#define WM_VOL_MAX 100 +#define WM_VOL_CNT 101/* 0dB .. -100dB */ #define WM_VOL_MUTE 0x8000static void wm_set_vol (struct snd_ice1712 *ice,unsigned int index,unsigned short vol,unsigned short master)
@@ -724,7 +706,8 @@ static void wm_set_vol(struct snd_ice1712 *ice, unsigned int index, unsigned shoif ((master &WM_VOL_MUTE ) || (vol &WM_VOL_MUTE )) nvol =0 ;else - nvol =127 - wm_vol[(((vol & ~WM_VOL_MUTE ) * (master & ~WM_VOL_MUTE )) /127 ) &WM_VOL_MAX ]; + nvol = ((vol %WM_VOL_CNT ) * (master %WM_VOL_CNT )) / +WM_VOL_MAX ;wm_put (ice, index, nvol);wm_put_nocache (ice, index,0x180 | nvol);
@@ -820,7 +803,7 @@ static int wm_vol_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info * uinfo->type =SNDRV_CTL_ELEM_TYPE_INTEGER ; uinfo->count = voices; uinfo->value.integer.min =0 ;/* mute (-101dB) */ - uinfo->value.integer.max =0x7F ;/* 0dB */ + uinfo->value.integer.max =WM_VOL_MAX ;/* 0dB */ return 0 ; }
@@ -850,7 +833,7 @@ static int wm_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *snd_ice1712_save_gpio_status (ice);for (i =0 ; i < voices; i++) {unsigned int vol = ucontrol->value.integer.value[i]; -if (vol >0x7f ) +if (vol >WM_VOL_MAX )continue ; vol |= spec->vol[ofs+i];if (vol != spec->vol[ofs+i]) {
sound/soc/imx/mx1_mx2-pcm.c +3 -3
@@ -322,12 +322,12 @@ static int mx1_mx2_pcm_open(struct snd_pcm_substream *substream)pr_debug ("%s: Requesting dma channel (%s)\n" , __func__, prtd->dma_params->name); - prtd->dma_ch =imx_dma_request_by_prio (prtd->dma_params->name, -DMA_PRIO_HIGH ); -if (prtd->dma_ch <0 ) { + ret =imx_dma_request_by_prio (prtd->dma_params->name,DMA_PRIO_HIGH ); +if (ret <0 ) {printk (KERN_ERR "Error %d requesting dma channel\n" , ret);return ret; } + prtd->dma_ch = ret;imx_dma_config_burstlen (prtd->dma_ch, prtd->dma_params->watermark_level);
sound/usb/usx2y/us122l.c +22 -6
@@ -194,7 +194,8 @@ static int usb_stream_hwdep_open(struct snd_hwdep *hw, struct file *file)if (!us122l->first) us122l->first = file; -if (us122l->dev->descriptor.idProduct ==USB_ID_US144 ) { +if (us122l->dev->descriptor.idProduct ==USB_ID_US144 || + us122l->dev->descriptor.idProduct ==USB_ID_US144MKII ) { iface =usb_ifnum_to_if (us122l->dev,0 );usb_autopm_get_interface (iface); }
@@ -209,7 +210,8 @@ static int usb_stream_hwdep_release(struct snd_hwdep *hw, struct file *file)struct usb_interface *iface;snd_printdd (KERN_DEBUG "%p %p\n" , hw, file); -if (us122l->dev->descriptor.idProduct ==USB_ID_US144 ) { +if (us122l->dev->descriptor.idProduct ==USB_ID_US144 || + us122l->dev->descriptor.idProduct ==USB_ID_US144MKII ) { iface =usb_ifnum_to_if (us122l->dev,0 );usb_autopm_put_interface (iface); }
@@ -476,7 +478,8 @@ static bool us122l_create_card(struct snd_card *card)int err;struct us122l *us122l =US122L (card); -if (us122l->dev->descriptor.idProduct ==USB_ID_US144 ) { +if (us122l->dev->descriptor.idProduct ==USB_ID_US144 || + us122l->dev->descriptor.idProduct ==USB_ID_US144MKII ) { err =usb_set_interface (us122l->dev,0 ,1 );if (err) {snd_printk (KERN_ERR "usb_set_interface error \n" );
@@ -495,7 +498,8 @@ static bool us122l_create_card(struct snd_card *card)if (!us122l_start (us122l,44100 ,256 ))return false; -if (us122l->dev->descriptor.idProduct ==USB_ID_US144 ) +if (us122l->dev->descriptor.idProduct ==USB_ID_US144 || + us122l->dev->descriptor.idProduct ==USB_ID_US144MKII ) err =us144_create_usbmidi (card);else err =us122l_create_usbmidi (card);
@@ -597,7 +601,8 @@ static int snd_us122l_probe(struct usb_interface *intf,struct snd_card *card;int err; -if (device->descriptor.idProduct ==USB_ID_US144 +if ((device->descriptor.idProduct ==USB_ID_US144 || + device->descriptor.idProduct ==USB_ID_US144MKII ) && device->speed ==USB_SPEED_HIGH ) {snd_printk (KERN_ERR "disable ehci-hcd to run US-144 \n" );return -ENODEV ;
@@ -692,7 +697,8 @@ static int snd_us122l_resume(struct usb_interface *intf)mutex_lock (&us122l->mutex);/* needed, doesn't restart without: */ -if (us122l->dev->descriptor.idProduct ==USB_ID_US144 ) { +if (us122l->dev->descriptor.idProduct ==USB_ID_US144 || + us122l->dev->descriptor.idProduct ==USB_ID_US144MKII ) { err =usb_set_interface (us122l->dev,0 ,1 );if (err) {snd_printk (KERN_ERR "usb_set_interface error \n" );
@@ -737,6 +743,16 @@ static struct usb_device_id snd_us122l_usb_id_table[] = { .idVendor = 0x0644, .idProduct = USB_ID_US144 }, + { + .match_flags = USB_DEVICE_ID_MATCH_DEVICE, + .idVendor = 0x0644, + .idProduct = USB_ID_US122MKII + }, + { + .match_flags = USB_DEVICE_ID_MATCH_DEVICE, + .idVendor = 0x0644, + .idProduct = USB_ID_US144MKII + }, {/* terminator */ } };
sound/usb/usx2y/us122l.h +2 -0
@@ -25,5 +25,7 @@ struct us122l {#define USB_ID_US122L 0x800E#define USB_ID_US144 0x800F +#define USB_ID_US122MKII 0x8021 +#define USB_ID_US144MKII 0x8020#endif