Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d082f8f 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:
  ALSA: hda - Fix unused warnings when !SND_HDA_NEEDS_RESUME
  ALSA: hda - Add a fix-up for Acer dmic with ALC271x codec
  ASoC: add a module alias to the FSI driver
  ALSA: emu10k1 - Fix "Music" controls to "Synth" controls in documents
  ARM: s3c2440: gta02; Register dfbmcs320 device for BT audio interface
  ASoC: codecs: JZ4740: Fix OOPS
  ASoC: Fix output PGA enabling in wm_hubs CODECs
  ASoC: sn95031: decorate function with __devexit_p()
  ASoC: SAMSUNG: Fix the inverted clocks handling for pcm driver
  ASoC: sst_platform: Fix lock acquring
  ASoC: fsi: driver safely remove for against irq
  ASoC: fsi: modify vague PM control on probe
  ASoC: fsi: take care in failing case of dai register
  MAINTAINERS: Update Samsung ASoC maintainer's id
  ASoC: WM8903: HP and Line out PGA/mixer DAPM fixes
  ASoC: Set left channel volume update bits for WM8994
  ASoC: fix config error path
  ASoC: check channel mismatch between cpu_dai and codec_dai
  ASoC: Tegra: Suspend/resume support
parents 258ba6a5 6a9a6f23

Documentation/sound/alsa/SB-Live-mixer.txt

+3 −3
Original line number Diff line number Diff line
@@ -87,14 +87,14 @@ accumulator. ALSA uses accumulators 0 and 1 for left and right PCM. 
The result is forwarded to the ADC capture FIFO (thus to the standard capture

PCM device).



name='Music Playback Volume',index=0

name='Synth Playback Volume',index=0



This control is used to attenuate samples for left and right MIDI FX-bus

accumulators. ALSA uses accumulators 4 and 5 for left and right MIDI samples.

The result samples are forwarded to the front DAC PCM slots of the AC97 codec.



name='Music Capture Volume',index=0

name='Music Capture Switch',index=0

name='Synth Capture Volume',index=0

name='Synth Capture Switch',index=0



These controls are used to attenuate samples for left and right MIDI FX-bus

accumulator. ALSA uses accumulators 4 and 5 for left and right PCM.

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5396,7 +5396,7 @@ F: drivers/media/video/*7146* 
F:	include/media/*7146*



SAMSUNG AUDIO (ASoC) DRIVERS

M:	Jassi Brar <jassi.brar@samsung.com>

M:	Jassi Brar <jassisinghbrar@gmail.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Supported

F:	sound/soc/samsung

arch/arm/mach-s3c2440/mach-gta02.c

+5 −0
Original line number Diff line number Diff line
@@ -409,6 +409,10 @@ struct platform_device s3c24xx_pwm_device = { 
	.num_resources	= 0,

};



static struct platform_device gta02_dfbmcs320_device = {

	.name = "dfbmcs320",

};



static struct i2c_board_info gta02_i2c_devs[] __initdata = {

	{

		I2C_BOARD_INFO("pcf50633", 0x73),
@@ -523,6 +527,7 @@ static struct platform_device *gta02_devices[] __initdata = { 
	&s3c_device_iis,

	&samsung_asoc_dma,

	&s3c_device_i2c0,

	&gta02_dfbmcs320_device,

	&gta02_buttons_device,

	&s3c_device_adc,

	&s3c_device_ts,

sound/pci/hda/hda_codec.c

+4 −0
Original line number Diff line number Diff line
@@ -937,6 +937,7 @@ void snd_hda_shutup_pins(struct hda_codec *codec) 
}

EXPORT_SYMBOL_HDA(snd_hda_shutup_pins);



#ifdef SND_HDA_NEEDS_RESUME

/* Restore the pin controls cleared previously via snd_hda_shutup_pins() */

static void restore_shutup_pins(struct hda_codec *codec)

{
@@ -953,6 +954,7 @@ static void restore_shutup_pins(struct hda_codec *codec) 
	}

	codec->pins_shutup = 0;

}

#endif



static void init_hda_cache(struct hda_cache_rec *cache,

			   unsigned int record_size);
@@ -1329,6 +1331,7 @@ static void purify_inactive_streams(struct hda_codec *codec) 
	}

}



#ifdef SND_HDA_NEEDS_RESUME

/* clean up all streams; called from suspend */

static void hda_cleanup_all_streams(struct hda_codec *codec)

{
@@ -1340,6 +1343,7 @@ static void hda_cleanup_all_streams(struct hda_codec *codec) 
			really_cleanup_stream(codec, p);

	}

}

#endif



/*

 * amp access functions

sound/pci/hda/patch_realtek.c

+24 −1
Original line number Diff line number Diff line
@@ -14868,6 +14868,23 @@ static void alc269_fixup_hweq(struct hda_codec *codec, 
	alc_write_coef_idx(codec, 0x1e, coef | 0x80);

}













static void alc271_fixup_dmic(struct hda_codec *codec,













			      const struct alc_fixup *fix, int action)













{













	static struct hda_verb verbs[] = {













		{0x20, AC_VERB_SET_COEF_INDEX, 0x0d},













		{0x20, AC_VERB_SET_PROC_COEF, 0x4000},













		{}













	};













	unsigned int cfg;

























	if (strcmp(codec->chip_name, "ALC271X"))













		return;













	cfg = snd_hda_codec_get_pincfg(codec, 0x12);













	if (get_defcfg_connect(cfg) == AC_JACK_PORT_FIXED)













		snd_hda_sequence_write(codec, verbs);













}



























enum {















	ALC269_FIXUP_SONY_VAIO,















	ALC275_FIXUP_SONY_VAIO_GPIO2,









@@ -14876,6 +14893,7 @@ enum {













	ALC269_FIXUP_ASUS_G73JW,















	ALC269_FIXUP_LENOVO_EAPD,















	ALC275_FIXUP_SONY_HWEQ,













	ALC271_FIXUP_DMIC,















};





























static const struct alc_fixup alc269_fixups[] = {










@@ -14929,7 +14947,11 @@ static const struct alc_fixup alc269_fixups[] = {













		.v.func = alc269_fixup_hweq,















		.chained = true,















		.chain_id = ALC275_FIXUP_SONY_VAIO_GPIO2













	}













	},













	[ALC271_FIXUP_DMIC] = {













		.type = ALC_FIXUP_FUNC,













		.v.func = alc271_fixup_dmic,













	},















};





























static struct snd_pci_quirk alc269_fixup_tbl[] = {









@@ -14938,6 +14960,7 @@ static struct snd_pci_quirk alc269_fixup_tbl[] = {













	SND_PCI_QUIRK(0x104d, 0x9084, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),















	SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),















	SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),













	SND_PCI_QUIRK_VENDOR(0x1025, "Acer Aspire", ALC271_FIXUP_DMIC),















	SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE),















	SND_PCI_QUIRK(0x17aa, 0x215e, "Thinkpad L512", ALC269_FIXUP_SKU_IGNORE),















	SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE),