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

Commit c2549312 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into topic/hda

parents 8d087c76 9966db22

include/sound/soc.h

+1 −2
Original line number Diff line number Diff line
@@ -248,8 +248,7 @@ typedef int (*hw_write_t)(void *,const char* ,int); 
extern struct snd_ac97_bus_ops soc_ac97_ops;



enum snd_soc_control_type {

	SND_SOC_CUSTOM = 1,

	SND_SOC_I2C,

	SND_SOC_I2C = 1,

	SND_SOC_SPI,

};

sound/pci/asihpi/asihpi.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include "hpioctl.h"



#include <linux/pci.h>

#include <linux/version.h>

#include <linux/init.h>

#include <linux/jiffies.h>

#include <linux/slab.h>

sound/pci/hda/patch_conexant.c

+4 −0
Original line number Diff line number Diff line
@@ -3075,6 +3075,7 @@ static const char * const cxt5066_models[CXT5066_MODELS] = { 
};



static const struct snd_pci_quirk cxt5066_cfg_tbl[] = {

	SND_PCI_QUIRK(0x1025, 0x054c, "Acer Aspire 3830TG", CXT5066_AUTO),

	SND_PCI_QUIRK_MASK(0x1025, 0xff00, 0x0400, "Acer", CXT5066_IDEAPAD),

	SND_PCI_QUIRK(0x1028, 0x02d8, "Dell Vostro", CXT5066_DELL_VOSTRO),

	SND_PCI_QUIRK(0x1028, 0x02f5, "Dell Vostro 320", CXT5066_IDEAPAD),
@@ -4379,6 +4380,8 @@ static const struct hda_codec_preset snd_hda_preset_conexant[] = { 
	  .patch = patch_cxt5066 },

	{ .id = 0x14f15069, .name = "CX20585",

	  .patch = patch_cxt5066 },

	{ .id = 0x14f1506c, .name = "CX20588",

	  .patch = patch_cxt5066 },

	{ .id = 0x14f1506e, .name = "CX20590",

	  .patch = patch_cxt5066 },

	{ .id = 0x14f15097, .name = "CX20631",
@@ -4407,6 +4410,7 @@ MODULE_ALIAS("snd-hda-codec-id:14f15066"); 
MODULE_ALIAS("snd-hda-codec-id:14f15067");

MODULE_ALIAS("snd-hda-codec-id:14f15068");

MODULE_ALIAS("snd-hda-codec-id:14f15069");

MODULE_ALIAS("snd-hda-codec-id:14f1506c");

MODULE_ALIAS("snd-hda-codec-id:14f1506e");

MODULE_ALIAS("snd-hda-codec-id:14f15097");

MODULE_ALIAS("snd-hda-codec-id:14f15098");

sound/soc/codecs/wm8991.c

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 


#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/version.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/delay.h>

sound/soc/imx/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -11,9 +11,6 @@ menuconfig SND_IMX_SOC 


if SND_IMX_SOC



config SND_MXC_SOC_SSI

	tristate



config SND_MXC_SOC_FIQ

	tristate
@@ -24,7 +21,6 @@ config SND_MXC_SOC_WM1133_EV1 
	tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted"

	depends on MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL

	select SND_SOC_WM8350

	select SND_MXC_SOC_SSI

	select SND_MXC_SOC_FIQ

	help

	  Enable support for audio on the i.MX31ADS with the WM1133-EV1
@@ -34,7 +30,6 @@ config SND_SOC_MX27VIS_AIC32X4 
	tristate "SoC audio support for Visstrim M10 boards"

	depends on MACH_IMX27_VISSTRIM_M10

	select SND_SOC_TVL320AIC32X4

	select SND_MXC_SOC_SSI

	select SND_MXC_SOC_MX2

	help

	  Say Y if you want to add support for SoC audio on Visstrim SM10
@@ -44,7 +39,6 @@ config SND_SOC_PHYCORE_AC97 
	tristate "SoC Audio support for Phytec phyCORE (and phyCARD) boards"

	depends on MACH_PCM043 || MACH_PCA100

	select SND_SOC_WM9712

	select SND_MXC_SOC_SSI

	select SND_MXC_SOC_FIQ

	help

	  Say Y if you want to add support for SoC audio on Phytec phyCORE
@@ -57,7 +51,6 @@ config SND_SOC_EUKREA_TLV320 
		|| MACH_EUKREA_MBIMXSD35_BASEBOARD \

		|| MACH_EUKREA_MBIMXSD51_BASEBOARD

	select SND_SOC_TLV320AIC23

	select SND_MXC_SOC_SSI

	select SND_MXC_SOC_FIQ

	help

	  Enable I2S based access to the TLV320AIC23B codec attached