sound fixes for 2.6.32-rc1
Linus,
please pull ALSA fixes for v2.6.32-rc1 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
including the following a few fixes for ASoC and HD-audio.
Thanks!
Takashi
===
Huang Weiyi (1):
ASoC: remove unused #include <linux/version.h>
Jassi (1):
ASoC: S3C lrsync function made to work with IRQs disabled.
Julia Lawall (1):
ASoC: Clean up error handling in MPC5200 DMA setup
Mark Brown (1):
ASoC: Fix display of stream name in DAPM debugfs
Takashi Iwai (8):
ALSA: hda - Add missing model=auto entry for ALC269
ALSA: hda - Set default GPIO for STAC/IDT codecs
ALSA: hda - Set default GPIO for IDT92HD71bxx
ALSA: hda - Fix HP/line-out initialization with IDT/STAC codecs
ALSA: hda - Add support for HP dv6
ALSA: hda - Fix IDT92HD83* codec setup
ALSA: hda - Fix Dell S14 pin setup
ALSA: hda - Fix MSI GX620 mixer
--- sound/pci/hda/patch_realtek.c | 21 ++++++++++-- sound/pci/hda/patch_sigmatel.c | 65 +++++++++++++++++++++------------------- sound/soc/codecs/ad1836.c | 1 - sound/soc/codecs/ad1938.c | 1 - sound/soc/codecs/wm8974.c | 1 - sound/soc/fsl/mpc5200_dma.c | 33 ++++++++++++-------- sound/soc/s3c24xx/s3c-i2s-v2.c | 16 ++++++---- sound/soc/soc-dapm.c | 7 ++-- 8 files changed, 85 insertions(+), 60 deletions(-)
sound/pci/hda/patch_realtek.c +17 -4
@@ -7927,8 +7927,9 @@ static struct snd_kcontrol_new alc883_fivestack_mixer[] = {static struct snd_kcontrol_new alc883_targa_mixer[] = {HDA_CODEC_VOLUME ("Front Playback Volume" ,0x0c ,0x0 ,HDA_OUTPUT ), +HDA_BIND_MUTE ("Front Playback Switch" ,0x0c ,2 ,HDA_INPUT ),HDA_CODEC_MUTE ("Headphone Playback Switch" ,0x14 ,0x0 ,HDA_OUTPUT ), -HDA_CODEC_MUTE ("Front Playback Switch" ,0x1b ,0x0 ,HDA_OUTPUT ), +HDA_CODEC_MUTE ("Speaker Playback Switch" ,0x1b ,0x0 ,HDA_OUTPUT ),HDA_CODEC_VOLUME ("Surround Playback Volume" ,0x0d ,0x0 ,HDA_OUTPUT ),HDA_BIND_MUTE ("Surround Playback Switch" ,0x0d ,2 ,HDA_INPUT ),HDA_CODEC_VOLUME_MONO ("Center Playback Volume" ,0x0e ,1 ,0x0 ,HDA_OUTPUT ),
@@ -7947,8 +7948,9 @@ static struct snd_kcontrol_new alc883_targa_mixer[] = {static struct snd_kcontrol_new alc883_targa_2ch_mixer[] = {HDA_CODEC_VOLUME ("Front Playback Volume" ,0x0c ,0x0 ,HDA_OUTPUT ), +HDA_BIND_MUTE ("Front Playback Switch" ,0x0c ,2 ,HDA_INPUT ),HDA_CODEC_MUTE ("Headphone Playback Switch" ,0x14 ,0x0 ,HDA_OUTPUT ), -HDA_CODEC_MUTE ("Front Playback Switch" ,0x1b ,0x0 ,HDA_OUTPUT ), +HDA_CODEC_MUTE ("Speaker Playback Switch" ,0x1b ,0x0 ,HDA_OUTPUT ),HDA_CODEC_VOLUME ("CD Playback Volume" ,0x0b ,0x04 ,HDA_INPUT ),HDA_CODEC_MUTE ("CD Playback Switch" ,0x0b ,0x04 ,HDA_INPUT ),HDA_CODEC_VOLUME ("Mic Playback Volume" ,0x0b ,0x0 ,HDA_INPUT ),
@@ -7960,6 +7962,15 @@ static struct snd_kcontrol_new alc883_targa_2ch_mixer[] = { { }/* end */ }; +static struct snd_kcontrol_new alc883_targa_8ch_mixer[] = { +HDA_CODEC_VOLUME ("Side Playback Volume" ,0x0f ,0x0 ,HDA_OUTPUT ), +HDA_BIND_MUTE ("Side Playback Switch" ,0x0f ,2 ,HDA_INPUT ), +HDA_CODEC_VOLUME ("Int Mic Playback Volume" ,0x0b ,0x1 ,HDA_INPUT ), +HDA_CODEC_VOLUME ("Int Mic Boost" ,0x19 ,0 ,HDA_INPUT ), +HDA_CODEC_MUTE ("Int Mic Playback Switch" ,0x0b ,0x1 ,HDA_INPUT ), + { }/* end */ +}; +static struct snd_kcontrol_new alc883_lenovo_101e_2ch_mixer[] = {HDA_CODEC_VOLUME ("Front Playback Volume" ,0x0c ,0x0 ,HDA_OUTPUT ),HDA_BIND_MUTE ("Front Playback Switch" ,0x0c ,2 ,HDA_INPUT ),
@@ -9167,7 +9178,8 @@ static struct alc_config_preset alc882_presets[] = { .init_hook = alc882_targa_automute, }, [ALC883_TARGA_8ch_DIG] = { - .mixers = { alc883_base_mixer, alc883_chmode_mixer }, + .mixers = { alc883_targa_mixer, alc883_targa_8ch_mixer, + alc883_chmode_mixer }, .init_verbs = { alc883_init_verbs, alc880_gpio3_init_verbs, alc883_targa_verbs }, .num_dacs = ARRAY_SIZE(alc883_dac_nids),
@@ -13370,7 +13382,8 @@ static const char *alc269_models[ALC269_MODEL_LAST] = { [ALC269_ASUS_EEEPC_P703] = "eeepc-p703", [ALC269_ASUS_EEEPC_P901] = "eeepc-p901", [ALC269_FUJITSU] = "fujitsu", - [ALC269_LIFEBOOK ] ="lifebook" + [ALC269_LIFEBOOK] = "lifebook", + [ALC269_AUTO] = "auto", };static struct snd_pci_quirk alc269_cfg_tbl[] = {
sound/pci/hda/patch_sigmatel.c +34 -31
144 lines not on this page · raw message
sound/soc/codecs/ad1836.c +0 -1
@@ -18,7 +18,6 @@#include <linux/init.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/kernel.h> #include <linux/device.h> #include <sound/core.h>
sound/soc/codecs/ad1938.c +0 -1
@@ -28,7 +28,6 @@#include <linux/init.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/kernel.h> #include <linux/device.h> #include <sound/core.h>
sound/soc/codecs/wm8974.c +0 -1
@@ -12,7 +12,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/fsl/mpc5200_dma.c +20 -13
@@ -447,6 +447,7 @@ int mpc5200_audio_dma_create(struct of_device *op)int size, irq, rc;const __be32 *prop;void __iomem *regs; +int ret;/* Fetch the registers and IRQ of the PSC */ irq =irq_of_parse_and_map (op->node,0 );
@@ -463,14 +464,16 @@ int mpc5200_audio_dma_create(struct of_device *op)/* Allocate and initialize the driver private data */ psc_dma =kzalloc (sizeof *psc_dma,GFP_KERNEL );if (!psc_dma) { -iounmap (regs); -return -ENOMEM ; + ret = -ENOMEM ; + goto out_unmap; }/* Get the PSC ID */ prop =of_get_property (op->node,"cell-index" , &size); -if (!prop || size <sizeof *prop) -return -ENODEV ; +if (!prop || size <sizeof *prop) { + ret = -ENODEV ; + goto out_free; + }spin_lock_init (&psc_dma->lock);mutex_init (&psc_dma->mutex);
@@ -493,9 +496,8 @@ int mpc5200_audio_dma_create(struct of_device *op)if (!psc_dma->capture.bcom_task || !psc_dma->playback.bcom_task) {dev_err (&op->dev,"Could not allocate bestcomm tasks\n" ); -iounmap (regs); -kfree (psc_dma); -return -ENODEV ; + ret = -ENODEV ; + goto out_free; }/* Disable all interrupts and reset the PSC */
@@ -537,12 +539,8 @@ int mpc5200_audio_dma_create(struct of_device *op) &psc_dma_bcom_irq_tx,IRQF_SHARED , "psc-dma-playback", &psc_dma->playback);if (rc) { -free_irq (psc_dma->irq, psc_dma); -free_irq (psc_dma->capture.irq, - &psc_dma->capture); -free_irq (psc_dma->playback.irq, - &psc_dma->playback); -return -ENODEV ; + ret = -ENODEV ; + goto out_irq; }/* Save what we've done so it can be found again later */
@@ -550,6 +548,15 @@ int mpc5200_audio_dma_create(struct of_device *op)/* Tell the ASoC OF helpers about it */ return snd_soc_register_platform (&mpc5200_audio_dma_platform); +out_irq: +free_irq (psc_dma->irq, psc_dma); +free_irq (psc_dma->capture.irq, &psc_dma->capture); +free_irq (psc_dma->playback.irq, &psc_dma->playback); +out_free: +kfree (psc_dma); +out_unmap: +iounmap (regs); +return ret; }EXPORT_SYMBOL_GPL (mpc5200_audio_dma_create);
sound/soc/s3c24xx/s3c-i2s-v2.c +10 -6
@@ -230,6 +230,8 @@ static void s3c2412_snd_rxctrl(struct s3c_i2sv2_info *i2s, int on)pr_debug ("%s: IIS: CON=%x MOD=%x FIC=%x\n" , __func__, con, mod, fic); } +#define msecs_to_loops (t) (loops_per_jiffy / 1000 * HZ * t) +/* * Wait for the LR signal to allow synchronisation to the L/R clock * from the codec. May only be needed for slave mode.
@@ -237,19 +239,21 @@ static void s3c2412_snd_rxctrl(struct s3c_i2sv2_info *i2s, int on)static int s3c2412_snd_lrsync (struct s3c_i2sv2_info *i2s) {u32 iiscon; -unsigned long timeout = jiffies +msecs_to_jiffies (5 ); +unsigned long loops =msecs_to_loops (5 );pr_debug ("Entered %s\n" , __func__); -while (1 ) { +while (--loops) { iiscon =readl (i2s->regs +S3C2412_IISCON );if (iiscon &S3C2412_IISCON_LRINDEX )break ; -if (timeout < jiffies) { -printk (KERN_ERR "%s: timeout\n" , __func__); -return -ETIMEDOUT ; - } +cpu_relax (); + } + +if (!loops) { +printk (KERN_ERR "%s: timeout\n" , __func__); +return -ETIMEDOUT ; }return 0 ;
sound/soc/soc-dapm.c +4 -3
@@ -1131,9 +1131,10 @@ static ssize_t dapm_widget_power_read_file(struct file *file, ret =snprintf (buf,PAGE_SIZE ,"%s: %s in %d out %d\n" , w->name, w->power ?"On" :"Off" , in, out); -if (w->active && w->sname) - ret +=snprintf (buf,PAGE_SIZE - ret," stream %s active\n" , - w->sname); +if (w->sname) + ret +=snprintf (buf + ret,PAGE_SIZE - ret," stream %s %s\n" , + w->sname, + w->active ?"active" :"inactive" );list_for_each_entry (p, &w->sources, list_sink) {if (p->connect)