evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fix/hda' into topic/hda

Browse source
This commit is contained in:
Takashi Iwai 2011-06-29 08:02:09 +02:00
commit c2549312d2
9 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/sound/soc.h
View file

@ -248,8 +248,7 @@ typedef int (*hw_write_t)(void *,const char* ,int);
extern struct snd_ac97_bus_ops soc_ac97_ops; extern struct snd_ac97_bus_ops soc_ac97_ops;
enum snd_soc_control_type { enum snd_soc_control_type {
SND_SOC_CUSTOM = 1, SND_SOC_I2C = 1,
SND_SOC_I2C,
SND_SOC_SPI, SND_SOC_SPI,
}; };

1
sound/pci/asihpi/asihpi.c
View file

@ -27,7 +27,6 @@
#include "hpioctl.h" #include "hpioctl.h"
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/version.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/slab.h> #include <linux/slab.h>

4
sound/pci/hda/patch_conexant.c
View file

@ -3075,6 +3075,7 @@ static const char * const cxt5066_models[CXT5066_MODELS] = {
}; };
static const struct snd_pci_quirk cxt5066_cfg_tbl[] = { 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_MASK(0x1025, 0xff00, 0x0400, "Acer", CXT5066_IDEAPAD),
SND_PCI_QUIRK(0x1028, 0x02d8, "Dell Vostro", CXT5066_DELL_VOSTRO), SND_PCI_QUIRK(0x1028, 0x02d8, "Dell Vostro", CXT5066_DELL_VOSTRO),
SND_PCI_QUIRK(0x1028, 0x02f5, "Dell Vostro 320", CXT5066_IDEAPAD), 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 }, .patch = patch_cxt5066 },
{ .id = 0x14f15069, .name = "CX20585", { .id = 0x14f15069, .name = "CX20585",
.patch = patch_cxt5066 }, .patch = patch_cxt5066 },
{ .id = 0x14f1506c, .name = "CX20588",
.patch = patch_cxt5066 },
{ .id = 0x14f1506e, .name = "CX20590", { .id = 0x14f1506e, .name = "CX20590",
.patch = patch_cxt5066 }, .patch = patch_cxt5066 },
{ .id = 0x14f15097, .name = "CX20631", { .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:14f15067");
MODULE_ALIAS("snd-hda-codec-id:14f15068"); MODULE_ALIAS("snd-hda-codec-id:14f15068");
MODULE_ALIAS("snd-hda-codec-id:14f15069"); 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:14f1506e");
MODULE_ALIAS("snd-hda-codec-id:14f15097"); MODULE_ALIAS("snd-hda-codec-id:14f15097");
MODULE_ALIAS("snd-hda-codec-id:14f15098"); MODULE_ALIAS("snd-hda-codec-id:14f15098");

1
sound/soc/codecs/wm8991.c
View file

@ -13,7 +13,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/version.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/delay.h> #include <linux/delay.h>

7
sound/soc/imx/Kconfig
View file

@ -11,9 +11,6 @@ menuconfig SND_IMX_SOC
if SND_IMX_SOC if SND_IMX_SOC
config SND_MXC_SOC_SSI
tristate
config SND_MXC_SOC_FIQ config SND_MXC_SOC_FIQ
tristate tristate
@ -24,7 +21,6 @@ config SND_MXC_SOC_WM1133_EV1
tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted" tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted"
depends on MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL depends on MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL
select SND_SOC_WM8350 select SND_SOC_WM8350
select SND_MXC_SOC_SSI
select SND_MXC_SOC_FIQ select SND_MXC_SOC_FIQ
help help
Enable support for audio on the i.MX31ADS with the WM1133-EV1 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" tristate "SoC audio support for Visstrim M10 boards"
depends on MACH_IMX27_VISSTRIM_M10 depends on MACH_IMX27_VISSTRIM_M10
select SND_SOC_TVL320AIC32X4 select SND_SOC_TVL320AIC32X4
select SND_MXC_SOC_SSI
select SND_MXC_SOC_MX2 select SND_MXC_SOC_MX2
help help
Say Y if you want to add support for SoC audio on Visstrim SM10 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" tristate "SoC Audio support for Phytec phyCORE (and phyCARD) boards"
depends on MACH_PCM043 || MACH_PCA100 depends on MACH_PCM043 || MACH_PCA100
select SND_SOC_WM9712 select SND_SOC_WM9712
select SND_MXC_SOC_SSI
select SND_MXC_SOC_FIQ select SND_MXC_SOC_FIQ
help help
Say Y if you want to add support for SoC audio on Phytec phyCORE 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_MBIMXSD35_BASEBOARD \
|| MACH_EUKREA_MBIMXSD51_BASEBOARD || MACH_EUKREA_MBIMXSD51_BASEBOARD
select SND_SOC_TLV320AIC23 select SND_SOC_TLV320AIC23
select SND_MXC_SOC_SSI
select SND_MXC_SOC_FIQ select SND_MXC_SOC_FIQ
help help
Enable I2S based access to the TLV320AIC23B codec attached Enable I2S based access to the TLV320AIC23B codec attached

2
sound/soc/imx/imx-pcm-dma-mx2.c
View file

@ -337,3 +337,5 @@ static void __exit snd_imx_pcm_exit(void)
platform_driver_unregister(&imx_pcm_driver); platform_driver_unregister(&imx_pcm_driver);
} }
module_exit(snd_imx_pcm_exit); module_exit(snd_imx_pcm_exit);
MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:imx-pcm-audio");

2
sound/soc/imx/imx-ssi.c
View file

@ -774,4 +774,4 @@ module_exit(imx_ssi_exit);
MODULE_AUTHOR("Sascha Hauer, <s.hauer@pengutronix.de>"); MODULE_AUTHOR("Sascha Hauer, <s.hauer@pengutronix.de>");
MODULE_DESCRIPTION("i.MX I2S/ac97 SoC Interface"); MODULE_DESCRIPTION("i.MX I2S/ac97 SoC Interface");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:imx-ssi");

4
sound/soc/pxa/pxa2xx-pcm.c
View file

@ -95,14 +95,14 @@ static int pxa2xx_soc_pcm_new(struct snd_card *card, struct snd_soc_dai *dai,
if (!card->dev->coherent_dma_mask) if (!card->dev->coherent_dma_mask)
card->dev->coherent_dma_mask = DMA_BIT_MASK(32); card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
if (dai->driver->playback.channels_min) { if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
ret = pxa2xx_pcm_preallocate_dma_buffer(pcm, ret = pxa2xx_pcm_preallocate_dma_buffer(pcm,
SNDRV_PCM_STREAM_PLAYBACK); SNDRV_PCM_STREAM_PLAYBACK);
if (ret) if (ret)
goto out; goto out;
} }
if (dai->driver->capture.channels_min) { if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
ret = pxa2xx_pcm_preallocate_dma_buffer(pcm, ret = pxa2xx_pcm_preallocate_dma_buffer(pcm,
SNDRV_PCM_STREAM_CAPTURE); SNDRV_PCM_STREAM_CAPTURE);
if (ret) if (ret)

3
sound/soc/soc-cache.c
View file

@ -409,9 +409,6 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
codec->bulk_write_raw = snd_soc_hw_bulk_write_raw; codec->bulk_write_raw = snd_soc_hw_bulk_write_raw;
switch (control) { switch (control) {
case SND_SOC_CUSTOM:
break;
case SND_SOC_I2C: case SND_SOC_I2C:
#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE)) #if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE))
codec->hw_write = (hw_write_t)i2c_master_send; codec->hw_write = (hw_write_t)i2c_master_send;