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

Commit 720e87ef 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: pcm: fix infinite loop in snd_pcm_update_hw_ptr0()
  ALSA: HDA: Add dock mic quirk for Lenovo Thinkpad X220
  ALSA: ens1371: fix Creative Ectiva support
  ALSA: firewire-speakers: fix hang when unplugging a running device
  ASoC: Fix CODEC device name for Corgi
  ALSA: hda - Fix pin-config of Gigabyte mobo
  ASoC: imx: fix burstsize for DMA
  ASoC: imx: set watermarks for mx2-dma
  ASoC: twl6040: Return -ENOMEM if create_singlethread_workqueue fails
  ASoC: tlv320dac33: Restore L/R DAC power control register
  ASoC: Explicitly say registerless widgets have no register
  ASoC: tlv320dac33: Fix inconsistent spinlock usage
parents ccd00d10 a0334c50

include/sound/soc-dapm.h

+8 −8
Original line number Diff line number Diff line
@@ -45,25 +45,25 @@ 
/* platform domain */

#define SND_SOC_DAPM_INPUT(wname) \

{	.id = snd_soc_dapm_input, .name = wname, .kcontrols = NULL, \

	.num_kcontrols = 0}

	.num_kcontrols = 0, .reg = SND_SOC_NOPM }

#define SND_SOC_DAPM_OUTPUT(wname) \

{	.id = snd_soc_dapm_output, .name = wname, .kcontrols = NULL, \

	.num_kcontrols = 0}

	.num_kcontrols = 0, .reg = SND_SOC_NOPM }

#define SND_SOC_DAPM_MIC(wname, wevent) \

{	.id = snd_soc_dapm_mic, .name = wname, .kcontrols = NULL, \

	.num_kcontrols = 0, .event = wevent, \

	.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \

	.event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD}

#define SND_SOC_DAPM_HP(wname, wevent) \

{	.id = snd_soc_dapm_hp, .name = wname, .kcontrols = NULL, \

	.num_kcontrols = 0, .event = wevent, \

	.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \

	.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}

#define SND_SOC_DAPM_SPK(wname, wevent) \

{	.id = snd_soc_dapm_spk, .name = wname, .kcontrols = NULL, \

	.num_kcontrols = 0, .event = wevent, \

	.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \

	.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}

#define SND_SOC_DAPM_LINE(wname, wevent) \

{	.id = snd_soc_dapm_line, .name = wname, .kcontrols = NULL, \

	.num_kcontrols = 0, .event = wevent, \

	.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \

	.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}



/* path domain */
@@ -189,11 +189,11 @@ 
/* events that are pre and post DAPM */

#define SND_SOC_DAPM_PRE(wname, wevent) \

{	.id = snd_soc_dapm_pre, .name = wname, .kcontrols = NULL, \

	.num_kcontrols = 0, .event = wevent, \

	.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \

	.event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD}

#define SND_SOC_DAPM_POST(wname, wevent) \

{	.id = snd_soc_dapm_post, .name = wname, .kcontrols = NULL, \

	.num_kcontrols = 0, .event = wevent, \

	.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \

	.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD}



/* stream domain */

sound/core/pcm_lib.c

+3 −1
Original line number Diff line number Diff line
@@ -375,6 +375,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, 
	}



	if (runtime->no_period_wakeup) {

		snd_pcm_sframes_t xrun_threshold;

		/*

		 * Without regular period interrupts, we have to check

		 * the elapsed time to detect xruns.
@@ -383,7 +384,8 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, 
		if (jdelta < runtime->hw_ptr_buffer_jiffies / 2)

			goto no_delta_check;

		hdelta = jdelta - delta * HZ / runtime->rate;

		while (hdelta > runtime->hw_ptr_buffer_jiffies / 2 + 1) {

		xrun_threshold = runtime->hw_ptr_buffer_jiffies / 2 + 1;

		while (hdelta > xrun_threshold) {

			delta += runtime->buffer_size;

			hw_base += runtime->buffer_size;

			if (hw_base >= runtime->boundary)

sound/firewire/speakers.c

+1 −2
Original line number Diff line number Diff line
@@ -778,10 +778,9 @@ static int __devexit fwspk_remove(struct device *dev) 
{

	struct fwspk *fwspk = dev_get_drvdata(dev);



	snd_card_disconnect(fwspk->card);



	mutex_lock(&fwspk->mutex);

	amdtp_out_stream_pcm_abort(&fwspk->stream);

	snd_card_disconnect(fwspk->card);

	fwspk_stop_stream(fwspk);

	mutex_unlock(&fwspk->mutex);

sound/pci/ens1370.c

+19 −4
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ MODULE_PARM_DESC(lineio, "Line In to Rear Out (0 = auto, 1 = force)."); 
#define ES_REG_1371_CODEC 0x14	/* W/R: Codec Read/Write register address */

#define   ES_1371_CODEC_RDY	   (1<<31)	/* codec ready */

#define   ES_1371_CODEC_WIP	   (1<<30)	/* codec register access in progress */

#define   EV_1938_CODEC_MAGIC	   (1<<26)

#define   ES_1371_CODEC_PIRD	   (1<<23)	/* codec read/write select register */

#define   ES_1371_CODEC_WRITE(a,d) ((((a)&0x7f)<<16)|(((d)&0xffff)<<0))

#define   ES_1371_CODEC_READS(a)   ((((a)&0x7f)<<16)|ES_1371_CODEC_PIRD)
@@ -603,12 +604,18 @@ static void snd_es1370_codec_write(struct snd_ak4531 *ak4531, 


#ifdef CHIP1371



static inline bool is_ev1938(struct ensoniq *ensoniq)

{

	return ensoniq->pci->device == 0x8938;

}



static void snd_es1371_codec_write(struct snd_ac97 *ac97,

				   unsigned short reg, unsigned short val)

{

	struct ensoniq *ensoniq = ac97->private_data;

	unsigned int t, x;

	unsigned int t, x, flag;



	flag = is_ev1938(ensoniq) ? EV_1938_CODEC_MAGIC : 0;

	mutex_lock(&ensoniq->src_mutex);

	for (t = 0; t < POLL_COUNT; t++) {

		if (!(inl(ES_REG(ensoniq, 1371_CODEC)) & ES_1371_CODEC_WIP)) {
@@ -630,7 +637,8 @@ static void snd_es1371_codec_write(struct snd_ac97 *ac97, 
				    0x00010000)

					break;

			}

			outl(ES_1371_CODEC_WRITE(reg, val), ES_REG(ensoniq, 1371_CODEC));

			outl(ES_1371_CODEC_WRITE(reg, val) | flag,

			     ES_REG(ensoniq, 1371_CODEC));

			/* restore SRC reg */

			snd_es1371_wait_src_ready(ensoniq);

			outl(x, ES_REG(ensoniq, 1371_SMPRATE));
@@ -647,8 +655,9 @@ static unsigned short snd_es1371_codec_read(struct snd_ac97 *ac97, 
					    unsigned short reg)

{

	struct ensoniq *ensoniq = ac97->private_data;

	unsigned int t, x, fail = 0;

	unsigned int t, x, flag, fail = 0;



	flag = is_ev1938(ensoniq) ? EV_1938_CODEC_MAGIC : 0;

      __again:

	mutex_lock(&ensoniq->src_mutex);

	for (t = 0; t < POLL_COUNT; t++) {
@@ -671,7 +680,8 @@ static unsigned short snd_es1371_codec_read(struct snd_ac97 *ac97, 
				    0x00010000)

					break;

			}

			outl(ES_1371_CODEC_READS(reg), ES_REG(ensoniq, 1371_CODEC));

			outl(ES_1371_CODEC_READS(reg) | flag,

			     ES_REG(ensoniq, 1371_CODEC));

			/* restore SRC reg */

			snd_es1371_wait_src_ready(ensoniq);

			outl(x, ES_REG(ensoniq, 1371_SMPRATE));
@@ -683,6 +693,11 @@ static unsigned short snd_es1371_codec_read(struct snd_ac97 *ac97, 
			/* now wait for the stinkin' data (RDY) */

			for (t = 0; t < POLL_COUNT; t++) {

				if ((x = inl(ES_REG(ensoniq, 1371_CODEC))) & ES_1371_CODEC_RDY) {

					if (is_ev1938(ensoniq)) {

						for (t = 0; t < 100; t++)

							inl(ES_REG(ensoniq, CONTROL));

						x = inl(ES_REG(ensoniq, 1371_CODEC));

					}

					mutex_unlock(&ensoniq->src_mutex);

					return ES_1371_CODEC_READ(x);

				}

sound/pci/hda/patch_conexant.c

+1 −0
Original line number Diff line number Diff line
@@ -3034,6 +3034,7 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x21c5, "Thinkpad Edge 13", CXT5066_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x21c6, "Thinkpad Edge 13", CXT5066_ASUS),

 	SND_PCI_QUIRK(0x17aa, 0x215e, "Lenovo Thinkpad", CXT5066_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x21da, "Lenovo X220", CXT5066_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo G560", CXT5066_ASUS),

	SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo", CXT5066_IDEAPAD), /* Fallback for Lenovos without dock mic */

	{}