tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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:
ASoC: tlv320aic23 fix rate selection
ASoC: OMAP3 Pandora: update for TWL4030 codec changes
ASoC: Modifying the license string GPLv2 for OMAP3 EVM
ALSA: hda - Fix quirk for VAIO type G
ALSA: usb - Quirk to disable master volume control in PCM2702

Linus Torvalds 70b172b2 486bfe5c

+14 -3
unified split
+1
sound/pci/hda/patch_realtek.c
··· 11462 11462 SND_PCI_QUIRK(0x104d, 0x9016, "Sony VAIO", ALC262_AUTO), /* dig-only */ 11463 11463 SND_PCI_QUIRK(0x104d, 0x9025, "Sony VAIO Z21MN", ALC262_TOSHIBA_S06), 11464 11464 SND_PCI_QUIRK(0x104d, 0x9035, "Sony VAIO VGN-FW170J", ALC262_AUTO), 11465 + SND_PCI_QUIRK(0x104d, 0x9047, "Sony VAIO Type G", ALC262_AUTO), 11465 11466 SND_PCI_QUIRK_MASK(0x104d, 0xff00, 0x9000, "Sony VAIO", 11466 11467 ALC262_SONY_ASSAMD), 11467 11468 SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba dynabook SS RX1",
+1 -1
sound/soc/codecs/tlv320aic23.c
··· 265 265 #define UPPER_GROUP ((1<<8) | (1<<9) | (1<<10) | (1<<11) | (1<<15)) 266 266 static const unsigned short sr_valid_mask[] = { 267 267 LOWER_GROUP|UPPER_GROUP, /* Normal, bosr - 0*/ 268 - LOWER_GROUP|UPPER_GROUP, /* Normal, bosr - 1*/ 269 268 LOWER_GROUP, /* Usb, bosr - 0*/ 269 + LOWER_GROUP|UPPER_GROUP, /* Normal, bosr - 1*/ 270 270 UPPER_GROUP, /* Usb, bosr - 1*/ 271 271 }; 272 272 /*
+1 -1
sound/soc/omap/omap3evm.c
··· 144 144 145 145 MODULE_AUTHOR("Anuj Aggarwal <anuj.aggarwal@ti.com>"); 146 146 MODULE_DESCRIPTION("ALSA SoC OMAP3 EVM"); 147 - MODULE_LICENSE("GPLv2"); 147 + MODULE_LICENSE("GPL v2");
+2 -1
sound/soc/omap/omap3pandora.c
··· 134 134 * |P| <--- TWL4030 <--------- Line In and MICs 135 135 */ 136 136 static const struct snd_soc_dapm_widget omap3pandora_out_dapm_widgets[] = { 137 - SND_SOC_DAPM_DAC("PCM DAC", "Playback", SND_SOC_NOPM, 0, 0), 137 + SND_SOC_DAPM_DAC("PCM DAC", "HiFi Playback", SND_SOC_NOPM, 0, 0), 138 138 SND_SOC_DAPM_PGA_E("Headphone Amplifier", SND_SOC_NOPM, 139 139 0, 0, NULL, 0, omap3pandora_hp_event, 140 140 SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), ··· 181 181 snd_soc_dapm_nc_pin(codec, "CARKITR"); 182 182 snd_soc_dapm_nc_pin(codec, "HFL"); 183 183 snd_soc_dapm_nc_pin(codec, "HFR"); 184 + snd_soc_dapm_nc_pin(codec, "VIBRA"); 184 185 185 186 ret = snd_soc_dapm_new_controls(codec, omap3pandora_out_dapm_widgets, 186 187 ARRAY_SIZE(omap3pandora_out_dapm_widgets));
+9
sound/usb/usbmixer.c
··· 1071 1071 channels = (ftr[0] - 7) / csize - 1; 1072 1072 1073 1073 master_bits = snd_usb_combine_bytes(ftr + 6, csize); 1074 + /* master configuration quirks */ 1075 + switch (state->chip->usb_id) { 1076 + case USB_ID(0x08bb, 0x2702): 1077 + snd_printk(KERN_INFO 1078 + "usbmixer: master volume quirk for PCM2702 chip\n"); 1079 + /* disable non-functional volume control */ 1080 + master_bits &= ~(1 << (USB_FEATURE_VOLUME - 1)); 1081 + break; 1082 + } 1074 1083 if (channels > 0) 1075 1084 first_ch_bits = snd_usb_combine_bytes(ftr + 6 + csize, csize); 1076 1085 else