Commit 70b172b2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 486bfe5c e2cd52e6

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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/omap3pandora.c

+2 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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

sound/soc/omap/omap3evm.c

+1 −1

File changed.

Contains only whitespace changes.

CRA Git | Maintained and supported by SUSTech CRA and CCSE