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

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

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

Pull sound fixes from Takashi Iwai:
 "Here are a small collecton of sound fix patches.

  The most significant one is the disablement of newly introduced
  topology API.  Its ABI couldn't be stabilized enough, so we decided to
  delay for 4.3 in the end.  Other than that, all oneliner fixes: a
  USB-audio runtime PM fix and a couple of HD-audio quirks"

* tag 'sound-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Add dock support for Thinkpad W541 (17aa:2211)
  ALSA: usb-audio: Fix runtime PM unbalance
  ASoC: topology: Disable use from userspace
  ASoC: topology: Add Kconfig option for topology
  ALSA: hda - Fix the white noise on Dell laptop
parents 3243f50b e24b6c03

include/sound/soc-topology.h

+12 −0
Original line number Original line Diff line number Diff line
@@ -141,6 +141,8 @@ struct snd_soc_tplg_ops { 
	int io_ops_count;

	int io_ops_count;

};

};





#ifdef CONFIG_SND_SOC_TOPOLOGY



/* gets a pointer to data from the firmware block header */

/* gets a pointer to data from the firmware block header */

static inline const void *snd_soc_tplg_get_data(struct snd_soc_tplg_hdr *hdr)

static inline const void *snd_soc_tplg_get_data(struct snd_soc_tplg_hdr *hdr)

{

{
@@ -165,4 +167,14 @@ int snd_soc_tplg_widget_bind_event(struct snd_soc_dapm_widget *w, 
	const struct snd_soc_tplg_widget_events *events, int num_events,

	const struct snd_soc_tplg_widget_events *events, int num_events,

	u16 event_type);

	u16 event_type);





#else



static inline int snd_soc_tplg_component_remove(struct snd_soc_component *comp,

						u32 index)

{

	return 0;

}



#endif



#endif
 
#endif

include/uapi/sound/asoc.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,12 @@ 
#include <linux/types.h>

#include <linux/types.h>

#include <sound/asound.h>

#include <sound/asound.h>





#ifndef __KERNEL__

#error This API is an early revision and not enabled in the current

#error kernel release, it will be enabled in a future kernel version

#error with incompatible changes to what is here.

#endif



/*

/*

 * Maximum number of channels topology kcontrol can represent.

 * Maximum number of channels topology kcontrol can represent.

 */

 */

sound/pci/hda/patch_realtek.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -5190,6 +5190,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x06d9, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x06d9, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x06da, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x06da, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x06de, "Dell", ALC292_FIXUP_DISABLE_AAMIX),

	SND_PCI_QUIRK(0x1028, 0x06de, "Dell", ALC292_FIXUP_DISABLE_AAMIX),

	SND_PCI_QUIRK(0x1028, 0x06db, "Dell", ALC292_FIXUP_DISABLE_AAMIX),

	SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),

	SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),
@@ -5291,6 +5292,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x220c, "Thinkpad T440s", ALC292_FIXUP_TPT440_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x220c, "Thinkpad T440s", ALC292_FIXUP_TPT440_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x220e, "Thinkpad T440p", ALC292_FIXUP_TPT440_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x220e, "Thinkpad T440p", ALC292_FIXUP_TPT440_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x2210, "Thinkpad T540p", ALC292_FIXUP_TPT440_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x2210, "Thinkpad T540p", ALC292_FIXUP_TPT440_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x2211, "Thinkpad W541", ALC292_FIXUP_TPT440_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x2212, "Thinkpad T440", ALC292_FIXUP_TPT440_DOCK),

	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, 0x2214, "Thinkpad X240", ALC292_FIXUP_TPT440_DOCK),

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

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

sound/soc/Kconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -30,6 +30,9 @@ config SND_SOC_GENERIC_DMAENGINE_PCM 
	bool

	bool

	select SND_DMAENGINE_PCM

	select SND_DMAENGINE_PCM





config SND_SOC_TOPOLOGY

	bool



# All the supported SoCs

# All the supported SoCs

source "sound/soc/adi/Kconfig"

source "sound/soc/adi/Kconfig"

source "sound/soc/atmel/Kconfig"

source "sound/soc/atmel/Kconfig"

sound/soc/Makefile

+3 −0
Original line number Original line Diff line number Diff line 
snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o

snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o

snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o soc-devres.o soc-ops.o

snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o soc-devres.o soc-ops.o



ifneq ($(CONFIG_SND_SOC_TOPOLOGY),)

snd-soc-core-objs += soc-topology.o

snd-soc-core-objs += soc-topology.o

endif





ifneq ($(CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM),)

ifneq ($(CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM),)

snd-soc-core-objs += soc-generic-dmaengine-pcm.o

snd-soc-core-objs += soc-generic-dmaengine-pcm.o