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

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

Pull sound fixes from Takashi Iwai:
 "We see various small fixes, but nothing looks too scary, all are small
  gentle bug fixes:

   - Most of changes are for ASoC codecs: Realtek, SGTL5000, TAS2552,
     TLV320, WM8962

   - A couple of dwc and imx-ssi fixes

   - Usual oneliner HD-audio quirks

   - An old emux synth code fix"

* tag 'sound-4.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  MAINTAINERS: Remove wm97xx entry
  ASoC: tas2552: fix dBscale-min declaration
  ALSA: synth: Fix conflicting OSS device registration on AWE32
  ALSA: hda - Disable power_save_node for IDT 92HD73xx chips
  ALSA: hda - Apply SPDIF pin ctl to MacBookPro 12,1
  ALSA: hda: Add dock support for ThinkPad T550
  ASoC: dwc: fix dma stop transferring issue
  ASoC: dwc: correct irq clear method
  ASoC: tlv320aic3x: Prevent writing reserved registers on tlv320aic3104 CODECs
  ASoC: rt5645: Correct the naming and setting of ADC Boost Volume Control
  ASoC: sgtl5000: fix wrong register MIC_BIAS_VOLTAGE setup on probe
  ASoC: wm8962: balance pm_runtime_enable
  ASoC: imx-ssi: Fix DAI hardware signal inversions
  ASoC: sgtl5000: fix error message output for MicBias voltage
  ASoC: db1200: Fix DAI link format for db1300 and db1550
parents fe621fde 601d6295

MAINTAINERS

+0 −9
Original line number Diff line number Diff line
@@ -11378,15 +11378,6 @@ W: http://oops.ghostprotocols.net:81/blog 
S:	Maintained

F:	drivers/net/wireless/wl3501*



WM97XX TOUCHSCREEN DRIVERS

M:	Mark Brown <broonie@kernel.org>

M:	Liam Girdwood <lrg@slimlogic.co.uk>

L:	linux-input@vger.kernel.org

W:	https://github.com/CirrusLogic/linux-drivers/wiki

S:	Supported

F:	drivers/input/touchscreen/*wm97*

F:	include/linux/wm97xx.h



WOLFSON MICROELECTRONICS DRIVERS

L:	patches@opensource.wolfsonmicro.com

T:	git https://github.com/CirrusLogic/linux-drivers.git

sound/pci/hda/patch_cirrus.c

+1 −0
Original line number Diff line number Diff line
@@ -633,6 +633,7 @@ static const struct snd_pci_quirk cs4208_mac_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x106b, 0x5e00, "MacBookPro 11,2", CS4208_MBP11),

	SND_PCI_QUIRK(0x106b, 0x7100, "MacBookAir 6,1", CS4208_MBA6),

	SND_PCI_QUIRK(0x106b, 0x7200, "MacBookAir 6,2", CS4208_MBA6),

	SND_PCI_QUIRK(0x106b, 0x7b00, "MacBookPro 12,1", CS4208_MBP11),

	{} /* terminator */

};

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -5306,6 +5306,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x2212, "Thinkpad T440", ALC292_FIXUP_TPT440_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x2214, "Thinkpad X240", ALC292_FIXUP_TPT440_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x2215, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x17aa, 0x2223, "ThinkPad T550", ALC292_FIXUP_TPT440_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x2226, "ThinkPad X250", ALC292_FIXUP_TPT440_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC),

	SND_PCI_QUIRK(0x17aa, 0x3978, "IdeaPad Y410P", ALC269_FIXUP_NO_SHUTUP),

sound/pci/hda/patch_sigmatel.c

+5 −1
Original line number Diff line number Diff line
@@ -4520,6 +4520,10 @@ static int patch_stac92hd73xx(struct hda_codec *codec) 
		return err;



	spec = codec->spec;

	/* enable power_save_node only for new 92HD89xx chips, as it causes

	 * click noises on old 92HD73xx chips.

	 */

	if ((codec->core.vendor_id & 0xfffffff0) != 0x111d7670)

		codec->power_save_node = 1;

	spec->linear_tone_beep = 0;

	spec->gen.mixer_nid = 0x1d;

sound/soc/au1x/db1200.c

+4 −0
Original line number Diff line number Diff line
@@ -129,6 +129,8 @@ static struct snd_soc_dai_link db1300_i2s_dai = { 
	.cpu_dai_name	= "au1xpsc_i2s.2",

	.platform_name	= "au1xpsc-pcm.2",

	.codec_name	= "wm8731.0-001b",

	.dai_fmt	= SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF |

			  SND_SOC_DAIFMT_CBM_CFM,

	.ops		= &db1200_i2s_wm8731_ops,

};
@@ -146,6 +148,8 @@ static struct snd_soc_dai_link db1550_i2s_dai = { 
	.cpu_dai_name	= "au1xpsc_i2s.3",

	.platform_name	= "au1xpsc-pcm.3",

	.codec_name	= "wm8731.0-001b",

	.dai_fmt	= SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF |

			  SND_SOC_DAIFMT_CBM_CFM,

	.ops		= &db1200_i2s_wm8731_ops,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE