sound fixes for 2.6.32
Subsystems (3)
Linus,
please pull yet more sound fixes for v2.6.32 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
All the following trivial and local fixes, so pretty safe to apply.
Thanks!
Takashi
===
Anuj Aggarwal (1):
ASoC: Modifying the license string GPLv2 for OMAP3 EVM
Grazvydas Ignotas (1):
ASoC: OMAP3 Pandora: update for TWL4030 codec changes
Javier Kohen (1):
ALSA: usb - Quirk to disable master volume control in PCM2702
Takashi Iwai (1):
ALSA: hda - Fix quirk for VAIO type G
Troy Kisky (1):
ASoC: tlv320aic23 fix rate selection
--- sound/pci/hda/patch_realtek.c | 1 + sound/soc/codecs/tlv320aic23.c | 2 +- sound/soc/omap/omap3evm.c | 2 +- sound/soc/omap/omap3pandora.c | 3 ++- sound/usb/usbmixer.c | 9 +++++++++ 5 files changed, 14 insertions(+), 3 deletions(-)
sound/pci/hda/patch_realtek.c +1 -0
@@ -11462,6 +11462,7 @@ static struct snd_pci_quirk alc262_cfg_tbl[] = {SND_PCI_QUIRK (0x104d ,0x9016 ,"Sony VAIO" ,ALC262_AUTO ),/* dig-only */ SND_PCI_QUIRK (0x104d ,0x9025 ,"Sony VAIO Z21MN" ,ALC262_TOSHIBA_S06 ),SND_PCI_QUIRK (0x104d ,0x9035 ,"Sony VAIO VGN-FW170J" ,ALC262_AUTO ), +SND_PCI_QUIRK (0x104d ,0x9047 ,"Sony VAIO Type G" ,ALC262_AUTO ),SND_PCI_QUIRK_MASK (0x104d ,0xff00 ,0x9000 ,"Sony VAIO" ,ALC262_SONY_ASSAMD ), SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba dynabook SS RX1",
sound/soc/codecs/tlv320aic23.c +1 -1
@@ -265,8 +265,8 @@ static const int bosr_usb_divisor_table[] = {#define UPPER_GROUP ((1<<8) | (1<<9) | (1<<10) | (1<<11) | (1<<15))static const unsigned short sr_valid_mask[] = {LOWER_GROUP |UPPER_GROUP ,/* Normal, bosr - 0*/ -LOWER_GROUP |UPPER_GROUP ,/* Normal, bosr - 1*/ LOWER_GROUP ,/* Usb, bosr - 0*/ +LOWER_GROUP |UPPER_GROUP ,/* Normal, bosr - 1*/ UPPER_GROUP ,/* Usb, bosr - 1*/ };/*
sound/soc/omap/omap3evm.c +1 -1
@@ -144,4 +144,4 @@ module_exit(omap3evm_soc_exit);MODULE_AUTHOR ("Anuj Aggarwal <[email protected]>" );MODULE_DESCRIPTION ("ALSA SoC OMAP3 EVM" ); -MODULE_LICENSE ("GPLv2" ); +MODULE_LICENSE ("GPL v2" );
sound/soc/omap/omap3pandora.c +2 -1
@@ -134,7 +134,7 @@ static int omap3pandora_hp_event(struct snd_soc_dapm_widget *w,* |P| <--- TWL4030 <--------- Line In and MICs */ static const struct snd_soc_dapm_widget omap3pandora_out_dapm_widgets[] = { -SND_SOC_DAPM_DAC ("PCM DAC" ,"Playback" ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_DAC ("PCM DAC" ,"HiFi Playback" ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_PGA_E ("Headphone Amplifier" ,SND_SOC_NOPM ,0 ,0 ,NULL ,0 , omap3pandora_hp_event,SND_SOC_DAPM_POST_PMU |SND_SOC_DAPM_PRE_PMD ),
@@ -181,6 +181,7 @@ static int omap3pandora_out_init(struct snd_soc_codec *codec)snd_soc_dapm_nc_pin (codec,"CARKITR" );snd_soc_dapm_nc_pin (codec,"HFL" );snd_soc_dapm_nc_pin (codec,"HFR" ); +snd_soc_dapm_nc_pin (codec,"VIBRA" ); ret =snd_soc_dapm_new_controls (codec, omap3pandora_out_dapm_widgets,ARRAY_SIZE (omap3pandora_out_dapm_widgets));
sound/usb/usbmixer.c +9 -0
@@ -1071,6 +1071,15 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, unsig channels = (ftr[0 ] -7 ) / csize -1 ; master_bits =snd_usb_combine_bytes (ftr +6 , csize); +/* master configuration quirks */ +switch (state->chip->usb_id) { +case USB_ID (0x08bb ,0x2702 ): +snd_printk (KERN_INFO +"usbmixer: master volume quirk for PCM2702 chip\n" ); +/* disable non-functional volume control */ + master_bits &= ~(1 << (USB_FEATURE_VOLUME -1 )); +break ; + }if (channels >0 ) first_ch_bits =snd_usb_combine_bytes (ftr +6 + csize, csize);else