Commit 71dc96e3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A few collections of small eggs that have been gathered during the
  Easter holidays.  Mostly small ASoC fixes, with a HD-audio quirk and a
  workaround for Nvidia controller"

* tag 'sound-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Suppress CORBRP clear on Nvidia controller chips
  ALSA: hda - add headset mic detect quirk for a Dell laptop
  ASoC: jz4740: Remove Makefile entry for removed file
  ASoC: Intel: Fix audio crash due to negative address offset
  ASoC: dapm: Fix widget double free with auto-disable DAPM kcontrol
  ASoC: Intel: Fix incorrect sizeof() in sst_hsw_stream_get_volume()
  ASoC: Intel: some incorrect sizeof() usages
  ASoC: cs42l73: Convert to use devm_gpio_request_one
  ASoC: cs42l52: Convert to use devm_gpio_request_one
  ASoC: tlv320aic31xx: document that the regulators are mandatory
  ASoC: fsl_spdif: Fix wrong OFFSET of STC_SYSCLK_DIV
  ASoC: alc5623: Fix regmap endianness
  ASoC: tlv320aic3x: fix shared reset pin for DT
  ASoC: rsnd: fix clock prepare/unprepare
parents ed8c37e1 6ba736dd

Documentation/devicetree/bindings/sound/tlv320aic31xx.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -13,6 +13,9 @@ Required properties: 
    "ti,tlv320aic3111" - TLV320AIC3111 (stereo speaker amp, MiniDSP)

    "ti,tlv320aic3111" - TLV320AIC3111 (stereo speaker amp, MiniDSP)





- reg - <int> -  I2C slave address

- reg - <int> -  I2C slave address

- HPVDD-supply, SPRVDD-supply, SPLVDD-supply, AVDD-supply, IOVDD-supply,

  DVDD-supply : power supplies for the device as covered in

  Documentation/devicetree/bindings/regulator/regulator.txt









Optional properties:

Optional properties:
@@ -24,9 +27,6 @@ Optional properties: 
        3 or MICBIAS_AVDD - MICBIAS output is connected to AVDD

        3 or MICBIAS_AVDD - MICBIAS output is connected to AVDD

	If this node is not mentioned or if the value is unknown, then

	If this node is not mentioned or if the value is unknown, then

	micbias	is set to 2.0V.

	micbias	is set to 2.0V.

- HPVDD-supply, SPRVDD-supply, SPLVDD-supply, AVDD-supply, IOVDD-supply,

  DVDD-supply : power supplies for the device as covered in

  Documentation/devicetree/bindings/regulator/regulator.txt





CODEC output pins:

CODEC output pins:

  * HPL

  * HPL

sound/pci/hda/hda_controller.c

+18 −16
Original line number Original line Diff line number Diff line
@@ -1059,6 +1059,7 @@ static void azx_init_cmd_io(struct azx *chip) 




	/* reset the corb hw read pointer */

	/* reset the corb hw read pointer */

	azx_writew(chip, CORBRP, ICH6_CORBRP_RST);

	azx_writew(chip, CORBRP, ICH6_CORBRP_RST);

	if (!(chip->driver_caps & AZX_DCAPS_CORBRP_SELF_CLEAR)) {

		for (timeout = 1000; timeout > 0; timeout--) {

		for (timeout = 1000; timeout > 0; timeout--) {

			if ((azx_readw(chip, CORBRP) & ICH6_CORBRP_RST) == ICH6_CORBRP_RST)

			if ((azx_readw(chip, CORBRP) & ICH6_CORBRP_RST) == ICH6_CORBRP_RST)

				break;

				break;
@@ -1077,6 +1078,7 @@ static void azx_init_cmd_io(struct azx *chip) 
		if (timeout <= 0)

		if (timeout <= 0)

			dev_err(chip->card->dev, "CORB reset timeout#2, CORBRP = %d\n",

			dev_err(chip->card->dev, "CORB reset timeout#2, CORBRP = %d\n",

				azx_readw(chip, CORBRP));

				azx_readw(chip, CORBRP));

	}





	/* enable corb dma */

	/* enable corb dma */

	azx_writeb(chip, CORBCTL, ICH6_CORBCTL_RUN);

	azx_writeb(chip, CORBCTL, ICH6_CORBCTL_RUN);

sound/pci/hda/hda_intel.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -249,7 +249,8 @@ enum { 
/* quirks for Nvidia */

/* quirks for Nvidia */

#define AZX_DCAPS_PRESET_NVIDIA \

#define AZX_DCAPS_PRESET_NVIDIA \

	(AZX_DCAPS_NVIDIA_SNOOP | AZX_DCAPS_RIRB_DELAY | AZX_DCAPS_NO_MSI |\

	(AZX_DCAPS_NVIDIA_SNOOP | AZX_DCAPS_RIRB_DELAY | AZX_DCAPS_NO_MSI |\

	 AZX_DCAPS_ALIGN_BUFSIZE | AZX_DCAPS_NO_64BIT)

	 AZX_DCAPS_ALIGN_BUFSIZE | AZX_DCAPS_NO_64BIT |\

	 AZX_DCAPS_CORBRP_SELF_CLEAR)





#define AZX_DCAPS_PRESET_CTHDA \

#define AZX_DCAPS_PRESET_CTHDA \

	(AZX_DCAPS_NO_MSI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_4K_BDLE_BOUNDARY)

	(AZX_DCAPS_NO_MSI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_4K_BDLE_BOUNDARY)

sound/pci/hda/hda_priv.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -189,6 +189,7 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 }; 
#define AZX_DCAPS_COUNT_LPIB_DELAY  (1 << 25)	/* Take LPIB as delay */

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

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

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

#define AZX_DCAPS_I915_POWERWELL (1 << 27)	/* HSW i915 powerwell support */

#define AZX_DCAPS_I915_POWERWELL (1 << 27)	/* HSW i915 powerwell support */

#define AZX_DCAPS_CORBRP_SELF_CLEAR (1 << 28)	/* CORBRP clears itself after reset */





/* position fix mode */

/* position fix mode */

enum {

enum {

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -4621,6 +4621,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x0667, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0667, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0668, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0668, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0669, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0669, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0674, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x067f, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x067f, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x15cc, "Dell X5 Precision", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x15cc, "Dell X5 Precision", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x15cd, "Dell X5 Precision", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x15cd, "Dell X5 Precision", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),