sound updates for 3.2-rc2
Subsystems (5)
Linus,
please pull sound fixes for v3.2-rc2 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-linus
The topmost commit is d938e66003c9ccc6c0ab10fa31ee23cf27574d66
This contains a few regression fixes, clean-ups and some trivial patches.
Thanks!
Takashi
===
Alexey Fisher (1):
ALSA: snd_usb_audio: add Logitech HD Webcam c510 to quirk-384
David Henningsson (1):
ALSA: HDA: Remove quirk for Toshiba T110
Denis V. Lunev (1):
ALSA: intel8x0: Improve comments for VM optimization
Julian Wollrath (1):
ALSA: hda - fix internal mic on Dell Vostro 3500 laptop
Konstantin Ozerkov (2):
ALSA: intel8x0: move virtual environment detection code into one place
ALSA: intel8x0: improve virtual environment detection
Mark Brown (4):
ASoC: Update git repository URL
ASoC: Don't use wm8994->control_data in wm8994_readable_register()
ASoC: Don't use wm8994->control_data when requesting IRQs
ASoC: Ensure we get an impedence reported for WM8958 jack detect
Takashi Iwai (5):
ALSA: hda - Mute unused capture sources for Realtek codecs
ALSA: usb-audio - Fix the missing volume quirks at delayed init
ALSA: hda - Don't add elements of other codecs to vmaster slave
ALSA: vmaster - Free slave-links when freeing the master element
ALSA: hda - Re-enable the check NO_PRESENCE misc bit
Thomas Meyer (1):
ALSA: usb-audio: Use kmemdup rather than duplicating its implementation
--- Documentation/sound/alsa/HD-Audio-Models.txt | 1 + MAINTAINERS | 2 +- include/linux/mfd/wm8994/registers.h | 15 ++++ sound/core/vmaster.c | 16 +++- sound/pci/hda/hda_codec.c | 64 ++++++++++----- sound/pci/hda/hda_codec.h | 1 + sound/pci/hda/hda_local.h | 16 ++-- sound/pci/hda/patch_conexant.c | 1 - sound/pci/hda/patch_realtek.c | 13 ++-- sound/pci/hda/patch_sigmatel.c | 11 +++ sound/pci/intel8x0.c | 58 +++++++++++--- sound/soc/codecs/wm8994.c | 43 +++++++--- sound/usb/mixer.c | 110 ++++++++++++++------------ sound/usb/quirks.c | 7 +- 14 files changed, 240 insertions(+), 118 deletions(-)
Documentation/sound/alsa/HD-Audio-Models.txt +1 -0
@@ -349,6 +349,7 @@ STAC92HD83* ref Reference board mic-ref Reference board with power management for ports dell-s14 Dell laptop + dell-vostro-3500 Dell Vostro 3500 laptop hp HP laptops with (inverted) mute-LED hp-dv7-4000 HP dv-7 4000 auto BIOS setup (default)
MAINTAINERS +1 -1
@@ -6122,7 +6122,7 @@ F: sound/ SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) M: Liam Girdwood <[email protected]> M: Mark Brown <[email protected]> -T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git L: [email protected] (moderated for non-subscribers) W: http://alsa-project.org/main/index.php/ASoC S: Supported
include/linux/mfd/wm8994/registers.h +15 -0
@@ -1963,6 +1963,21 @@#define WM8958_MICB2_DISCH_WIDTH 1/* MICB2_DISCH */ /* +* R210 (0xD2) - Mic Detect 3 +*/ +#define WM8958_MICD_LVL_MASK 0x07FC/* MICD_LVL - [10:2] */ +#define WM8958_MICD_LVL_SHIFT 2/* MICD_LVL - [10:2] */ +#define WM8958_MICD_LVL_WIDTH 9/* MICD_LVL - [10:2] */ +#define WM8958_MICD_VALID 0x0002/* MICD_VALID */ +#define WM8958_MICD_VALID_MASK 0x0002/* MICD_VALID */ +#define WM8958_MICD_VALID_SHIFT 1/* MICD_VALID */ +#define WM8958_MICD_VALID_WIDTH 1/* MICD_VALID */ +#define WM8958_MICD_STS 0x0001/* MICD_STS */ +#define WM8958_MICD_STS_MASK 0x0001/* MICD_STS */ +#define WM8958_MICD_STS_SHIFT 0/* MICD_STS */ +#define WM8958_MICD_STS_WIDTH 1/* MICD_STS */ + +/* * R76 (0x4C) - Charge Pump (1) */ #define WM8994_CP_ENA 0x8000/* CP_ENA */
sound/core/vmaster.c +13 -3
@@ -52,6 +52,7 @@ struct link_slave {struct link_ctl_info info;int vals[2 ];/* current values */ unsigned int flags; +struct snd_kcontrol *kctl;/* original kcontrol pointer */ struct snd_kcontrol slave;/* the copy of original control entry */ };
@@ -252,6 +253,7 @@ int _snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave, slave->count * sizeof(*slave->vd), GFP_KERNEL);if (!srec)return -ENOMEM ; + srec->kctl = slave; srec->slave = *slave;memcpy (srec->slave.vd, slave->vd, slave->count *sizeof (*slave->vd)); srec->master = master_link;
@@ -333,10 +335,18 @@ static int master_put(struct snd_kcontrol *kcontrol,static void master_free (struct snd_kcontrol *kcontrol) {struct link_master *master =snd_kcontrol_chip (kcontrol); -struct link_slave *slave; +struct link_slave *slave, *n; -list_for_each_entry (slave, &master->slaves, list) - slave->master =NULL ; +/* free all slave links and retore the original slave kctls */ +list_for_each_entry_safe (slave, n, &master->slaves, list) { +struct snd_kcontrol *sctl = slave->kctl; +struct list_head olist = sctl->list; +memcpy (sctl, &slave->slave,sizeof (*sctl)); +memcpy (sctl->vd, slave->slave.vd, + sctl->count *sizeof (*sctl->vd)); + sctl->list = olist;/* keep the current linked-list */ +kfree (slave); + }kfree (master); }
sound/pci/hda/hda_codec.c +43 -21
96 lines not on this page · raw message
sound/pci/hda/hda_codec.h +1 -0
@@ -854,6 +854,7 @@ struct hda_codec { unsigned int no_sticky_stream:1; /* no sticky-PCM stream assignment */ unsigned int pins_shutup:1; /* pins are shut up */ unsigned int no_trigger_sense:1; /* don't trigger at pin-sensing */ + unsigned int ignore_misc_bit:1; /* ignore MISC_NO_PRESENCE bit */#ifdef CONFIG_SND_HDA_POWER_SAVE unsigned int power_on :1; /* current (global) power-state */ unsigned int power_transition :1; /* power-state in transition */
sound/pci/hda/hda_local.h +9 -7
@@ -510,13 +510,15 @@ int snd_hda_jack_detect(struct hda_codec *codec, hda_nid_t nid);static inline bool is_jack_detectable (struct hda_codec *codec,hda_nid_t nid) { -return (snd_hda_query_pin_caps (codec, nid) &AC_PINCAP_PRES_DETECT ) && -/* disable MISC_NO_PRESENCE check because it may break too -* many devices -*/ -/*(get_defcfg_misc(snd_hda_codec_get_pincfg(codec, nid) & -AC_DEFCFG_MISC_NO_PRESENCE)) &&*/ - (get_wcaps (codec, nid) &AC_WCAP_UNSOL_CAP ); +if (!(snd_hda_query_pin_caps (codec, nid) &AC_PINCAP_PRES_DETECT )) +return false; +if (!codec->ignore_misc_bit && + (get_defcfg_misc (snd_hda_codec_get_pincfg (codec, nid)) & +AC_DEFCFG_MISC_NO_PRESENCE )) +return false; +if (!(get_wcaps (codec, nid) &AC_WCAP_UNSOL_CAP )) +return false; +return true; }/* flags for hda_nid_item */
sound/pci/hda/patch_conexant.c +0 -1
@@ -3062,7 +3062,6 @@ static const struct snd_pci_quirk cxt5066_cfg_tbl[] = {SND_PCI_QUIRK (0x1043 ,0x1993 ,"Asus U50F" ,CXT5066_ASUS ),SND_PCI_QUIRK (0x1179 ,0xff1e ,"Toshiba Satellite C650D" ,CXT5066_IDEAPAD ),SND_PCI_QUIRK (0x1179 ,0xff50 ,"Toshiba Satellite P500-PSPGSC-01800T" ,CXT5066_OLPC_XO_1_5 ), -SND_PCI_QUIRK (0x1179 ,0xffe0 ,"Toshiba Satellite Pro T130-15F" ,CXT5066_OLPC_XO_1_5 ),SND_PCI_QUIRK (0x14f1 ,0x0101 ,"Conexant Reference board" ,CXT5066_LAPTOP ), SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5),
sound/pci/hda/patch_realtek.c +7 -6
@@ -284,7 +284,7 @@ static int alc_mux_select(struct hda_codec *codec, unsigned int adc_idx,struct alc_spec *spec = codec->spec;const struct hda_input_mux *imux;unsigned int mux_idx; -int i, type; +int i, type, num_conns;hda_nid_t nid; mux_idx = adc_idx >= spec->num_mux_defs ?0 : adc_idx;
@@ -307,16 +307,17 @@ static int alc_mux_select(struct hda_codec *codec, unsigned int adc_idx, spec->capsrc_nids[adc_idx] : spec->adc_nids[adc_idx];/* no selection? */ -if (snd_hda_get_conn_list (codec, nid,NULL ) <=1 ) + num_conns =snd_hda_get_conn_list (codec, nid,NULL ); +if (num_conns <=1 )return 1 ; type =get_wcaps_type (get_wcaps (codec, nid));if (type ==AC_WID_AUD_MIX ) {/* Matrix-mixer style (e.g. ALC882) */ -for (i =0 ; i < imux->num_items; i++) { -unsigned int v = (i == idx) ?0 :HDA_AMP_MUTE ; -snd_hda_codec_amp_stereo (codec, nid,HDA_INPUT , - imux->items[i].index, +int active = imux->items[idx].index; +for (i =0 ; i < num_conns; i++) { +unsigned int v = (i == active) ?0 :HDA_AMP_MUTE ; +snd_hda_codec_amp_stereo (codec, nid,HDA_INPUT , i,HDA_AMP_MUTE , v); } }else {
sound/pci/hda/patch_sigmatel.c +11 -0
@@ -95,6 +95,7 @@ enum {STAC_92HD83XXX_REF ,STAC_92HD83XXX_PWR_REF ,STAC_DELL_S14 , +STAC_DELL_VOSTRO_3500 ,STAC_92HD83XXX_HP , STAC_92HD83XXX_HP_cNB11_INTQUAD, STAC_HP_DV7_4000,
@@ -1659,6 +1660,12 @@ static const unsigned int dell_s14_pin_configs[10] = { 0x40f000f0, 0x40f000f0, }; +static const unsigned int dell_vostro_3500_pin_configs[10 ] = { +0x02a11020 ,0x0221101f ,0x400000f0 ,0x90170110 , +0x400000f1 ,0x400000f2 ,0x400000f3 ,0x90a60160 , +0x400000f4 ,0x400000f5 , +}; +static const unsigned int hp_dv7_4000_pin_configs[10 ] = {0x03a12050 ,0x0321201f ,0x40f000f0 ,0x90170110 ,0x40f000f0 ,0x40f000f0 ,0x90170110 ,0xd5a30140 ,
@@ -1675,6 +1682,7 @@ static const unsigned int *stac92hd83xxx_brd_tbl[STAC_92HD83XXX_MODELS] = { [STAC_92HD83XXX_REF] = ref92hd83xxx_pin_configs, [STAC_92HD83XXX_PWR_REF] = ref92hd83xxx_pin_configs, [STAC_DELL_S14] = dell_s14_pin_configs, + [STAC_DELL_VOSTRO_3500] = dell_vostro_3500_pin_configs, [STAC_92HD83XXX_HP_cNB11_INTQUAD] = hp_cNB11_intquad_pin_configs, [STAC_HP_DV7_4000] = hp_dv7_4000_pin_configs, };
@@ -1684,6 +1692,7 @@ static const char * const stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = { [STAC_92HD83XXX_REF] = "ref", [STAC_92HD83XXX_PWR_REF] = "mic-ref", [STAC_DELL_S14] = "dell-s14", + [STAC_DELL_VOSTRO_3500] = "dell-vostro-3500", [STAC_92HD83XXX_HP] = "hp", [STAC_92HD83XXX_HP_cNB11_INTQUAD] = "hp_cNB11_intquad", [STAC_HP_DV7_4000] = "hp-dv7-4000",
@@ -1697,6 +1706,8 @@ static const struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = { "DFI LanParty", STAC_92HD83XXX_REF),SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x02ba ,"unknown Dell" ,STAC_DELL_S14 ), +SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x1028 , +"Dell Vostro 3500" ,STAC_DELL_VOSTRO_3500 ),SND_PCI_QUIRK_MASK (PCI_VENDOR_ID_HP ,0xff00 ,0x3600 ,"HP" ,STAC_92HD83XXX_HP ), SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1656,
sound/pci/intel8x0.c +47 -11
82 lines not on this page · raw message
sound/soc/codecs/wm8994.c +29 -14
64 lines not on this page · raw message
sound/usb/mixer.c +60 -50
155 lines not on this page · raw message
sound/usb/quirks.c +3 -4
@@ -137,12 +137,12 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip,return -ENOMEM ; }if (fp->nr_rates >0 ) { - rate_table =kmalloc (sizeof (int ) * fp->nr_rates,GFP_KERNEL ); + rate_table =kmemdup (fp->rate_table, +sizeof (int ) * fp->nr_rates,GFP_KERNEL );if (!rate_table) {kfree (fp);return -ENOMEM ; } -memcpy (rate_table, fp->rate_table,sizeof (int ) * fp->nr_rates); fp->rate_table = rate_table; }
@@ -224,10 +224,9 @@ static int create_uaxx_quirk(struct snd_usb_audio *chip,if (altsd->bNumEndpoints !=1 )return -ENXIO ; - fp =kmalloc (sizeof (*fp),GFP_KERNEL ); + fp =kmemdup (&ua_format,sizeof (*fp),GFP_KERNEL );if (!fp)return -ENOMEM ; -memcpy (fp, &ua_format,sizeof (*fp)); fp->iface = altsd->bInterfaceNumber; fp->endpoint =get_endpoint (alts,0 )->bEndpointAddress;