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

Commit f470b8c2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "The highlight of this update is the fixes for ASoC kirkwood by
  Russell.  In addition to that, a couple of regression fixes for
  HD-audio due to the runtime PM support on 3.7, and other driver-
  specific regression fixes like USB MIDI on non-standard USB audio
  drivers."

* tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: snd-usb: properly initialize the sync endpoint
  ALSA: hda - Cirrus: Correctly clear line_out_pins when moving to speaker
  ALSA: hda - Add support for Realtek ALC292
  ASoC: kirkwood-i2s: more pause-mode fixes
  ASoC: kirkwood-i2s: fix DMA underruns
  ASoC: kirkwood-i2s: fix DCO lock detection
  ASoC: kirkwood-dma: don't ignore other irq causes on error
  ASoC: kirkwood-dma: fix use of virt_to_phys()
  ALSA: hda - Limit runtime PM support only to known Intel chips
  ALSA: hda - Fix recursive suspend/resume call
  ALSA: ua101, usx2y: fix broken MIDI output
  ASoC: arizona: Fix typo - Swap value in 48k_rates[] and 44k1_rates[]
  ASoC: bells: Fix up git patch application failure
  ASoC: cs4271: free allocated GPIO
parents eb5aaedd 947d2996

sound/pci/hda/hda_codec.c

+9 −2
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static int codec_exec_verb(struct hda_codec *codec, unsigned int cmd, 
	}

	mutex_unlock(&bus->cmd_mutex);

	snd_hda_power_down(codec);

	if (res && *res == -1 && bus->rirb_error) {

	if (!codec->in_pm && res && *res == -1 && bus->rirb_error) {

		if (bus->response_reset) {

			snd_printd("hda_codec: resetting BUS due to "

				   "fatal communication error\n");
@@ -238,7 +238,7 @@ static int codec_exec_verb(struct hda_codec *codec, unsigned int cmd, 
		goto again;

	}

	/* clear reset-flag when the communication gets recovered */

	if (!err)

	if (!err || codec->in_pm)

		bus->response_reset = 0;

	return err;

}
@@ -3616,6 +3616,8 @@ static unsigned int hda_call_codec_suspend(struct hda_codec *codec, bool in_wq) 
{

	unsigned int state;



	codec->in_pm = 1;



	if (codec->patch_ops.suspend)

		codec->patch_ops.suspend(codec);

	hda_cleanup_all_streams(codec);
@@ -3630,6 +3632,7 @@ static unsigned int hda_call_codec_suspend(struct hda_codec *codec, bool in_wq) 
	codec->power_transition = 0;

	codec->power_jiffies = jiffies;

	spin_unlock(&codec->power_lock);

	codec->in_pm = 0;

	return state;

}
@@ -3638,6 +3641,8 @@ static unsigned int hda_call_codec_suspend(struct hda_codec *codec, bool in_wq) 
 */

static void hda_call_codec_resume(struct hda_codec *codec)

{

	codec->in_pm = 1;



	/* set as if powered on for avoiding re-entering the resume

	 * in the resume / power-save sequence

	 */
@@ -3656,6 +3661,8 @@ static void hda_call_codec_resume(struct hda_codec *codec) 
		snd_hda_codec_resume_cache(codec);

	}

	snd_hda_jack_report_sync(codec);



	codec->in_pm = 0;

	snd_hda_power_down(codec); /* flag down before returning */

}

#endif /* CONFIG_PM */

sound/pci/hda/hda_codec.h

+1 −0
Original line number Diff line number Diff line
@@ -869,6 +869,7 @@ struct hda_codec { 
	unsigned int power_on :1;	/* current (global) power-state */

	unsigned int d3_stop_clk:1;	/* support D3 operation without BCLK */

	unsigned int pm_down_notified:1; /* PM notified to controller */

	unsigned int in_pm:1;		/* suspend/resume being performed */

	int power_transition;	/* power-state in transition */

	int power_count;	/* current (global) power refcount */

	struct delayed_work power_work; /* delayed task for powerdown */

sound/pci/hda/hda_intel.c

+20 −19
Original line number Diff line number Diff line
@@ -556,6 +556,12 @@ enum { 
#define AZX_DCAPS_ALIGN_BUFSIZE	(1 << 22)	/* buffer size alignment */

#define AZX_DCAPS_4K_BDLE_BOUNDARY (1 << 23)	/* BDLE in 4k boundary */

#define AZX_DCAPS_COUNT_LPIB_DELAY  (1 << 25)	/* Take LPIB as delay */

#define AZX_DCAPS_PM_RUNTIME	(1 << 26)	/* runtime PM support */



/* quirks for Intel PCH */

#define AZX_DCAPS_INTEL_PCH \

	(AZX_DCAPS_SCH_SNOOP | AZX_DCAPS_BUFSIZE | \

	 AZX_DCAPS_COUNT_LPIB_DELAY | AZX_DCAPS_PM_RUNTIME)



/* quirks for ATI SB / AMD Hudson */

#define AZX_DCAPS_PRESET_ATI_SB \
@@ -2433,6 +2439,9 @@ static void azx_power_notify(struct hda_bus *bus, bool power_up) 
{

	struct azx *chip = bus->private_data;



	if (!(chip->driver_caps & AZX_DCAPS_PM_RUNTIME))

		return;



	if (power_up)

		pm_runtime_get_sync(&chip->pci->dev);

	else
@@ -2548,7 +2557,8 @@ static int azx_runtime_suspend(struct device *dev) 
	struct snd_card *card = dev_get_drvdata(dev);

	struct azx *chip = card->private_data;



	if (!power_save_controller)

	if (!power_save_controller ||

	    !(chip->driver_caps & AZX_DCAPS_PM_RUNTIME))

		return -EAGAIN;



	azx_stop_chip(chip);
@@ -3429,39 +3439,30 @@ static void __devexit azx_remove(struct pci_dev *pci) 
static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {

	/* CPT */

	{ PCI_DEVICE(0x8086, 0x1c20),

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_SCH_SNOOP |

	  AZX_DCAPS_BUFSIZE | AZX_DCAPS_COUNT_LPIB_DELAY },

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },

	/* PBG */

	{ PCI_DEVICE(0x8086, 0x1d20),

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_SCH_SNOOP |

	  AZX_DCAPS_BUFSIZE},

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },

	/* Panther Point */

	{ PCI_DEVICE(0x8086, 0x1e20),

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_SCH_SNOOP |

	  AZX_DCAPS_BUFSIZE | AZX_DCAPS_COUNT_LPIB_DELAY },

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },

	/* Lynx Point */

	{ PCI_DEVICE(0x8086, 0x8c20),

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_SCH_SNOOP |

	  AZX_DCAPS_BUFSIZE | AZX_DCAPS_COUNT_LPIB_DELAY },

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },

	/* Lynx Point-LP */

	{ PCI_DEVICE(0x8086, 0x9c20),

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_SCH_SNOOP |

	  AZX_DCAPS_BUFSIZE | AZX_DCAPS_COUNT_LPIB_DELAY },

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },

	/* Lynx Point-LP */

	{ PCI_DEVICE(0x8086, 0x9c21),

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_SCH_SNOOP |

	  AZX_DCAPS_BUFSIZE | AZX_DCAPS_COUNT_LPIB_DELAY },

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },

	/* Haswell */

	{ PCI_DEVICE(0x8086, 0x0c0c),

	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_SCH_SNOOP |

	  AZX_DCAPS_BUFSIZE | AZX_DCAPS_COUNT_LPIB_DELAY },

	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH },

	{ PCI_DEVICE(0x8086, 0x0d0c),

	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_SCH_SNOOP |

	  AZX_DCAPS_BUFSIZE | AZX_DCAPS_COUNT_LPIB_DELAY },

	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH },

	/* 5 Series/3400 */

	{ PCI_DEVICE(0x8086, 0x3b56),

	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_SCH_SNOOP |

	  AZX_DCAPS_BUFSIZE | AZX_DCAPS_COUNT_LPIB_DELAY },

	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH },

	/* SCH */

	{ PCI_DEVICE(0x8086, 0x811b),

	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_SCH_SNOOP |

sound/pci/hda/patch_cirrus.c

+1 −0
Original line number Diff line number Diff line
@@ -466,6 +466,7 @@ static int parse_output(struct hda_codec *codec) 
		memcpy(cfg->speaker_pins, cfg->line_out_pins,

		       sizeof(cfg->speaker_pins));

		cfg->line_outs = 0;

		memset(cfg->line_out_pins, 0, sizeof(cfg->line_out_pins));

	}



	return 0;

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -7065,6 +7065,7 @@ static const struct hda_codec_preset snd_hda_preset_realtek[] = { 
	{ .id = 0x10ec0282, .name = "ALC282", .patch = patch_alc269 },

	{ .id = 0x10ec0283, .name = "ALC283", .patch = patch_alc269 },

	{ .id = 0x10ec0290, .name = "ALC290", .patch = patch_alc269 },

	{ .id = 0x10ec0292, .name = "ALC292", .patch = patch_alc269 },

	{ .id = 0x10ec0861, .rev = 0x100340, .name = "ALC660",

	  .patch = patch_alc861 },

	{ .id = 0x10ec0660, .name = "ALC660-VD", .patch = patch_alc861vd },