sound fixes
Linus,
please pull ALSA updates for v2.6.30-rc6 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
containing just the following trivial fixes.
Thanks!
Takashi
===
Adam Williamson (1):
ALSA: hda - fix audio on HP TX25xx series notebooks
Andreas Mohr (1):
ALSA: Kill truncate warning by shortening Sigmatel-specific AC97 control name
Takashi Iwai (1):
ALSA: pcsp - fix printk format warning again
--- sound/drivers/pcsp/pcsp_mixer.c | 2 +- sound/pci/ac97/ac97_patch.c | 7 +++++-- sound/pci/ca0106/ca0106_mixer.c | 2 +- sound/pci/hda/patch_realtek.c | 1 + 4 files changed, 8 insertions(+), 4 deletions(-)
sound/drivers/pcsp/pcsp_mixer.c +1 -1
@@ -51,7 +51,7 @@ static int pcsp_treble_info(struct snd_kcontrol *kcontrol,if (uinfo->value.enumerated.item > chip->max_treble) uinfo->value.enumerated.item = chip->max_treble;sprintf (uinfo->value.enumerated.name,"%lu" , -PCSP_CALC_RATE (uinfo->value.enumerated.item)); + (unsigned long )PCSP_CALC_RATE (uinfo->value.enumerated.item));return 0 ; }
sound/pci/ac97/ac97_patch.c +5 -2
@@ -958,10 +958,13 @@ static int patch_sigmatel_stac9708_3d(struct snd_ac97 * ac97) }static const struct snd_kcontrol_new snd_ac97_sigmatel_4speaker = -AC97_SINGLE ("Sigmatel 4-Speaker Stereo Playback Switch" ,AC97_SIGMATEL_DAC2INVERT ,2 ,1 ,0 ); +AC97_SINGLE ("Sigmatel 4-Speaker Stereo Playback Switch" , +AC97_SIGMATEL_DAC2INVERT ,2 ,1 ,0 ); +/* "Sigmatel " removed due to excessive name length: */ static const struct snd_kcontrol_new snd_ac97_sigmatel_phaseinvert = -AC97_SINGLE ("Sigmatel Surround Phase Inversion Playback Switch" ,AC97_SIGMATEL_DAC2INVERT ,3 ,1 ,0 ); +AC97_SINGLE ("Surround Phase Inversion Playback Switch" , +AC97_SIGMATEL_DAC2INVERT ,3 ,1 ,0 );static const struct snd_kcontrol_new snd_ac97_sigmatel_controls[] = {AC97_SINGLE ("Sigmatel DAC 6dB Attenuate" ,AC97_SIGMATEL_ANALOG ,1 ,1 ,0 ),
sound/pci/ca0106/ca0106_mixer.c +1 -1
@@ -800,7 +800,7 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu)"Capture Volume" ,"External Amplifier" ,"Sigmatel 4-Speaker Stereo Playback Switch" , -"Sigmatel Surround Phase Inversion Playback " , +"Surround Phase Inversion Playback Switch" ,NULL }; static char *ca0106_rename_ctls[] = {
sound/pci/hda/patch_realtek.c +1 -0
@@ -12058,6 +12058,7 @@ static struct snd_pci_quirk alc268_cfg_tbl[] = {SND_PCI_QUIRK (0x1028 ,0x0253 ,"Dell OEM" ,ALC268_DELL ),SND_PCI_QUIRK (0x1028 ,0x02b0 ,"Dell Inspiron Mini9" ,ALC268_DELL ),SND_PCI_QUIRK (0x103c ,0x30cc ,"TOSHIBA" ,ALC268_TOSHIBA ), +SND_PCI_QUIRK (0x103c ,0x30f1 ,"HP TX25xx series" ,ALC268_TOSHIBA ),SND_PCI_QUIRK (0x1043 ,0x1205 ,"ASUS W7J" ,ALC268_3ST ),SND_PCI_QUIRK (0x1179 ,0xff10 ,"TOSHIBA A205" ,ALC268_TOSHIBA ), SND_PCI_QUIRK(0x1179, 0xff50, "TOSHIBA A305", ALC268_TOSHIBA),
Quoted 6 lines · Takashi Iwai
please pull ALSA updates for v2.6.30-rc6 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.gitfor-linuscontaining just the following trivial fixes.
Thanks, pulled.
I also note that you've been active on
http://bugzilla.kernel.org/show_bug.cgi?id=13250
but quite frankly, my opinion is that the workaround listed there isn't a fix at all. Why isn't such a frontpanel configuration choice exported as a switch, so that you can access it with alsamixer, rather than playing crazy games with some magic sysfs files?
If it cannot be autodetected, it should still be visible as a mixer option, not some magic. No?
Linus
At Fri, 22 May 2009 13:47:52 -0700 (PDT),
Quoted 17 lines · Linus Torvalds
Quoted 6 lines · Takashi Iwai
please pull ALSA updates for v2.6.30-rc6 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.gitfor-linuscontaining just the following trivial fixes.
Thanks, pulled.
I also note that you've been active on
http://bugzilla.kernel.org/show_bug.cgi?id=13250
Quoted 7 lines
but quite frankly, my opinion is that the workaround listed there isn't a fix at all. Why isn't such a frontpanel configuration choice exported as a switch, so that you can access it with alsamixer, rather than playing crazy games with some magic sysfs files?
If it cannot be autodetected, it should still be visible as a mixer option, not some magic. No?
Yeah, the method I suggested there is a typical "debug" procedure and no right "fix" yet.
[Short background:
Basically the HD-audio is designed in a way that BIOS could specify the proper h/w configuration, and the driver needs just to follow that. The problem now is when the hardware doesn't match really with what BIOS assumes -- i.e. the driver is fooled. In the bug above, the box isn't connected to the front panel as BIOS expected. And, a recent fix for the Headphone volume control appears now as if a regression for his use case.]
We can of course add some mixer element to change the DAC assignment. Some codecs have a mixer "Channel Mode" to change the surround mode. In a similar way, the front HP / mic could be changed. But, the implementation in patch_sigmatel.c is a bit complex to put such a mixer element into the middle, so I'm afraid it would be a bit risky at this stage.
Alternatively, what we did in most cases for such a case are to create a specific quirk and let user pass via model option. For this particular case, this would be a simpler fix because basically we just need to give a new pin-config map like an (untested) patch below.
Anyway, I'll follow up the bug there with that patch...
thanks,
Takashi
---
sound/pci/hda/patch_sigmatel.c +10 -0
@@ -150,6 +150,7 @@ enum {STAC_D965_REF ,STAC_D965_3ST ,STAC_D965_5ST , +STAC_D965_5ST_NO_FP ,STAC_DELL_3ST ,STAC_DELL_BIOS ,STAC_927X_MODELS
@@ -2154,6 +2155,13 @@ static unsigned int d965_5st_pin_configs[14] = {0x40000100 ,0x40000100 }; +static unsigned int d965_5st_no_fp_pin_configs[14 ] = { +0x40000100 ,0x40000100 ,0x0181304e ,0x01014010 , +0x01a19040 ,0x01011012 ,0x01016011 ,0x40000100 , +0x40000100 ,0x40000100 ,0x40000100 ,0x01442070 , +0x40000100 ,0x40000100 +}; +static unsigned int dell_3st_pin_configs[14 ] = {0x02211230 ,0x02a11220 ,0x01a19040 ,0x01114210 , 0x01111212, 0x01116211, 0x01813050, 0x01112214,
@@ -2166,6 +2174,7 @@ static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = { [STAC_D965_REF] = ref927x_pin_configs, [STAC_D965_3ST] = d965_3st_pin_configs, [STAC_D965_5ST] = d965_5st_pin_configs, + [STAC_D965_5ST_NO_FP] = d965_5st_no_fp_pin_configs, [STAC_DELL_3ST] = dell_3st_pin_configs, [STAC_DELL_BIOS] = NULL, };
@@ -2176,6 +2185,7 @@ static const char *stac927x_models[STAC_927X_MODELS] = { [STAC_D965_REF] = "ref", [STAC_D965_3ST] = "3stack", [STAC_D965_5ST] = "5stack", + [STAC_D965_5ST_NO_FP] = "5stack-no-fp", [STAC_DELL_3ST] = "dell-3stack", [STAC_DELL_BIOS] = "dell-bios", };