ALSA fixes for 2.6.29-rc2
Subsystems (6)
Linus,
please pull ALSA updates for 2.6.29-rc2 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
Mostly trivial and small fixes only.
Thanks!
Takashi
===
Ben Nizette (1):
ASoC: atmel_pcm: Remove non-existant header
Clemens Ladisch (3):
sound: virtuoso: enable UART on Xonar HDAV1.3
sound: virtuoso: add newline
sound: virtuoso: document HDAV1.3 driver status
Henrik Kretzschmar (1):
sound: Remove removed OSS kernel parameters from doc
Luke Yelavich (1):
ALSA: hda - add quirks for some 82801H variants to use ALC883_MITAC
Matthew Ranostay (1):
ALSA: hda: fix invalid power mapping masks
Takashi Iwai (1):
ALSA: hda - Fix (yet more) STAC925x issues
--- Documentation/kernel-parameters.txt | 7 ------- sound/pci/Kconfig | 4 ++-- sound/pci/hda/patch_realtek.c | 2 ++ sound/pci/hda/patch_sigmatel.c | 17 +++++++++-------- sound/pci/oxygen/virtuoso.c | 3 ++- sound/soc/atmel/atmel-pcm.c | 2 -- 6 files changed, 15 insertions(+), 20 deletions(-)
Documentation/kernel-parameters.txt +0 -7
@@ -577,9 +577,6 @@ and is between 256 and 4096 characters. It is defined in the file a memory unit (amount[KMG]). See also Documentation/kdump/kdump.txt for a example. - cs4232= [HW,OSS] - Format: <io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq> - cs89x0_dma= [HW,NET] Format: <dma>
@@ -732,10 +729,6 @@ and is between 256 and 4096 characters. It is defined in the file Default value is 0. Value can be changed at runtime via /selinux/enforce. - es1371= [HW,OSS] - Format: <spdif>,[<nomix>,[<amplifier>]] - See also header of sound/oss/es1371.c. - ether= [HW,NET] Ethernet cards parameters This option is obsoleted by the "netdev=" option, which has equivalent usage. See its documentation for details.
sound/pci/Kconfig +2 -2
@@ -744,8 +744,8 @@ config SND_VIRTUOSO select SND_OXYGEN_LIB help Say Y here to include support for sound cards based on the - Asus AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X and - HDAV1.3 (Deluxe). + Asus AV100/AV200 chips, i.e., Xonar D1, DX, D2 and D2X. + Support for the HDAV1.3 (Deluxe) is very experimental. To compile this driver as a module, choose M here: the module will be called snd-virtuoso.
sound/pci/hda/patch_realtek.c +2 -0
@@ -8478,6 +8478,7 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {SND_PCI_QUIRK (0x1043 ,0x835f ,"Asus Eee 1601" ,ALC888_ASUS_EEE1601 ),SND_PCI_QUIRK (0x105b ,0x0ce8 ,"Foxconn P35AX-S" ,ALC883_6ST_DIG ),SND_PCI_QUIRK (0x105b ,0x6668 ,"Foxconn" ,ALC883_6ST_DIG ), +SND_PCI_QUIRK (0x1071 ,0x8227 ,"Mitac 82801H" ,ALC883_MITAC ),SND_PCI_QUIRK (0x1071 ,0x8253 ,"Mitac 8252d" ,ALC883_MITAC ),SND_PCI_QUIRK (0x1071 ,0x8258 ,"Evesham Voyaeger" ,ALC883_LAPTOP_EAPD ), SND_PCI_QUIRK(0x10f1, 0x2350, "TYAN-S2350", ALC888_6ST_DELL),
@@ -8526,6 +8527,7 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {SND_PCI_QUIRK (0x1991 ,0x5625 ,"Haier W66" ,ALC883_HAIER_W66 ),SND_PCI_QUIRK (0x8086 ,0x0001 ,"DG33BUC" , ALC883_3ST_6ch_INTEL),SND_PCI_QUIRK (0x8086 ,0x0002 ,"DG33FBC" , ALC883_3ST_6ch_INTEL), +SND_PCI_QUIRK (0x8086 ,0x2503 ,"82801H" ,ALC883_MITAC ),SND_PCI_QUIRK (0x8086 ,0x0022 ,"DX58SO" , ALC883_3ST_6ch_INTEL), SND_PCI_QUIRK(0x8086, 0xd601, "D102GGC", ALC883_3ST_6ch), {}
sound/pci/hda/patch_sigmatel.c +9 -8
@@ -334,7 +334,7 @@ static hda_nid_t stac92hd83xxx_slave_dig_outs[2] = { };static unsigned int stac92hd83xxx_pwr_mapping[4 ] = { -0x03 ,0x0c ,0x10 ,0x40 , +0x03 ,0x0c ,0x20 ,0x80 , };static hda_nid_t stac92hd83xxx_amp_nids[1 ] = {
@@ -885,8 +885,8 @@ static struct hda_verb stac92hd71bxx_analog_core_init[] = {static struct hda_verb stac925x_core_init[] = {/* set dac0mux for dac converter */ {0x06 ,AC_VERB_SET_CONNECT_SEL ,0x00 }, -/* unmute and set max the selector */ - {0x0e ,AC_VERB_SET_AMP_GAIN_MUTE ,0xb01f }, +/* mute the master volume */ + {0x0e ,AC_VERB_SET_AMP_GAIN_MUTE ,AMP_OUT_MUTE }, {} };
@@ -1138,6 +1138,8 @@ static struct snd_kcontrol_new stac92hd71bxx_mixer[] = { };static struct snd_kcontrol_new stac925x_mixer[] = { +HDA_CODEC_VOLUME ("Master Playback Volume" ,0x0e ,0 ,HDA_OUTPUT ), +HDA_CODEC_MUTE ("Master Playback Switch" ,0x0e ,0 ,HDA_OUTPUT ),STAC_INPUT_SOURCE (1 ),HDA_CODEC_VOLUME ("Capture Volume" ,0x09 ,0 ,HDA_OUTPUT ),HDA_CODEC_MUTE ("Capture Switch" ,0x14 ,0 ,HDA_OUTPUT ),
@@ -3573,13 +3575,12 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out err =stac92xx_auto_fill_dac_nids (codec);if (err <0 )return err; + err =stac92xx_auto_create_multi_out_ctls (codec, + &spec->autocfg); +if (err <0 ) +return err; } - err =stac92xx_auto_create_multi_out_ctls (codec, &spec->autocfg); - -if (err <0 ) -return err; -/* setup analog beep controls */ if (spec->anabeep_nid >0 ) { err = stac92xx_auto_create_beep_ctls(codec,
sound/pci/oxygen/virtuoso.c +2 -1
@@ -683,7 +683,7 @@ static void xonar_hdav_uart_input(struct oxygen *chip)if (chip->uart_input_count >=2 && chip->uart_input[chip->uart_input_count -2 ] =='O' && chip->uart_input[chip->uart_input_count -1 ] =='K' ) { -printk (KERN_DEBUG "message from Xonar HDAV HDMI chip received:" ); +printk (KERN_DEBUG "message from Xonar HDAV HDMI chip received:\n" );print_hex_dump_bytes ("" ,DUMP_PREFIX_OFFSET , chip->uart_input, chip->uart_input_count); chip->uart_input_count =0 ;
@@ -908,6 +908,7 @@ static const struct oxygen_model model_xonar_hdav = { .dac_channels = 8, .dac_volume_min = 0x0f, .dac_volume_max = 0xff, + .misc_flags = OXYGEN_MISC_MIDI, .function_flags = OXYGEN_FUNCTION_2WIRE, .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
sound/soc/atmel/atmel-pcm.c +0 -2
@@ -44,8 +44,6 @@#include <sound/pcm_params.h> #include <sound/soc.h> -#include <mach/hardware.h> -#include "atmel-pcm.h"