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

Commit 03cef710 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Here are a bunch of fixes as you can see in diffstat.

  One core change in ASoC is about the unexpected unbinding error, and
  another about debugfs cleanup.

  The rest are wide-spread driver-specific fixes: a series of LINE6 USB
  fixes, a HD-audio quirk, and various ASoC fixes including OMAP boot
  fixes and Intel SKL fixes"

* tag 'sound-4.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (22 commits)
  ALSA: hda/realtek - fix headset mic detection for MSI MS-B120
  ASoC: omap-mcpdm: Fix irq resource handling
  ASoC: max98371: Add terminate entry for i2c_device_id tables
  ALSA: line6: Fix POD sysfs attributes segfault
  ALSA: line6: Give up on the lock while URBs are released.
  ALSA: line6: Remove double line6_pcm_release() after failed acquire.
  ASoC: omap-abe-twl6040: Correct dmic-codec device registration
  ASoC: core: Clean up DAPM before the card debugfs
  ASoC: omap-mcpdm: Drop pdmclk clock handling
  ASoC: atmel_ssc_dai: Don't unconditionally reset SSC on stream startup
  ASoC: compress: Fix leak of a widget list in soc_compr_open_fe
  ASoC: Intel: Skylake: Fix error return code in skl_probe()
  ASoC: wm2000: Fix return of uninitialised varible
  ASoC: Fix leak of rtd in soc_bind_dai_link
  ASoC: da7213: Default to 64 BCLKs per WCLK to support all formats
  ASoC: nau8825: fix static check error about semaphone control
  ASoC: nau8825: fix bug in playback when suspend
  ASoC: samsung: Fix clock handling in S3C24XX_UDA134X card
  ASoC: simple-card-utils: add missing MODULE_xxx()
  ASoC: Intel: Skylake: Check list empty while getting module info
  ...
parents 28687b93 a820cd3d

Documentation/devicetree/bindings/sound/omap-mcpdm.txt

+0 −10
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ Required properties: 
- interrupts: Interrupt number for McPDM

- interrupt-parent: The parent interrupt controller

- ti,hwmods: Name of the hwmod associated to the McPDM

- clocks:  phandle for the pdmclk provider, likely <&twl6040>

- clock-names: Must be "pdmclk"



Example:
@@ -21,11 +19,3 @@ mcpdm: mcpdm@40132000 { 
	interrupt-parent = <&gic>;

	ti,hwmods = "mcpdm";

};
 


In board DTS file the pdmclk needs to be added:



&mcpdm {

	clocks = <&twl6040>;

	clock-names = "pdmclk";

	status = "okay";

};

sound/pci/hda/patch_realtek.c

+4 −3
Original line number Diff line number Diff line
@@ -4828,7 +4828,7 @@ enum { 
	ALC293_FIXUP_DELL1_MIC_NO_PRESENCE,

	ALC292_FIXUP_TPT440_DOCK,

	ALC292_FIXUP_TPT440,

	ALC283_FIXUP_BXBT2807_MIC,

	ALC283_FIXUP_HEADSET_MIC,

	ALC255_FIXUP_DELL_WMI_MIC_MUTE_LED,

	ALC282_FIXUP_ASPIRE_V5_PINS,

	ALC280_FIXUP_HP_GPIO4,
@@ -5321,7 +5321,7 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC292_FIXUP_TPT440_DOCK,

	},

	[ALC283_FIXUP_BXBT2807_MIC] = {

	[ALC283_FIXUP_HEADSET_MIC] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {

			{ 0x19, 0x04a110f0 },
@@ -5651,7 +5651,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x10cf, 0x1757, "Lifebook E752", ALC269_FIXUP_LIFEBOOK_HP_PIN),

	SND_PCI_QUIRK(0x10cf, 0x1845, "Lifebook U904", ALC269_FIXUP_LIFEBOOK_EXTMIC),

	SND_PCI_QUIRK(0x144d, 0xc109, "Samsung Ativ book 9 (NP900X3G)", ALC269_FIXUP_INV_DMIC),

	SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_BXBT2807_MIC),

	SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x1462, 0xb120, "MSI Cubi MS-B120", ALC283_FIXUP_HEADSET_MIC),

	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),

sound/soc/atmel/atmel_ssc_dai.c

+3 −2
Original line number Diff line number Diff line
@@ -299,7 +299,8 @@ static int atmel_ssc_startup(struct snd_pcm_substream *substream, 
	clk_enable(ssc_p->ssc->clk);

	ssc_p->mck_rate = clk_get_rate(ssc_p->ssc->clk);



	/* Reset the SSC to keep it at a clean status */

	/* Reset the SSC unless initialized to keep it in a clean state */

	if (!ssc_p->initialized)

		ssc_writel(ssc_p->ssc->regs, CR, SSC_BIT(CR_SWRST));



	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

sound/soc/codecs/da7213.c

+2 −2
Original line number Diff line number Diff line
@@ -1247,8 +1247,8 @@ static int da7213_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) 
		return -EINVAL;

	}



	/* By default only 32 BCLK per WCLK is supported */

	dai_clk_mode |= DA7213_DAI_BCLKS_PER_WCLK_32;

	/* By default only 64 BCLK per WCLK is supported */

	dai_clk_mode |= DA7213_DAI_BCLKS_PER_WCLK_64;



	snd_soc_write(codec, DA7213_DAI_CLK_MODE, dai_clk_mode);

	snd_soc_update_bits(codec, DA7213_DAI_CTRL, DA7213_DAI_FORMAT_MASK,

sound/soc/codecs/max98371.c

+1 −0
Original line number Diff line number Diff line
@@ -412,6 +412,7 @@ static int max98371_i2c_remove(struct i2c_client *client) 


static const struct i2c_device_id max98371_i2c_id[] = {

	{ "max98371", 0 },

	{ }

};



MODULE_DEVICE_TABLE(i2c, max98371_i2c_id);