sound fixes for 2.6.31-rc1
Subsystems (3)
Linus,
please pull ALSA fixes for v2.6.31-rc1 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
Most of changes below are trivial, especially a wide range of changes come from the rewrite with PCI_VDEVICE() for PCI ids, in addition to HD-audio fixes.
Thanks!
Takashi
===
Clemens Ladisch (1):
sound: oxygen: make mic volume control mono
Emilio López (1):
ALSA: hda - Fix acer-aspire-6530g model quirk
Jiri Slaby (1):
sound: OSS: mpu401, fix deadlock
Joe Perches (2):
sound: Use PCI_VDEVICE
sound: Use PCI_VDEVICE for CREATIVE and ECTIVA
Ondrej Zary (1):
ALSA: cmi8330: fix MPU-401 PnP init copy&paste bug
Peter Ujfalusi (1):
MAINTAINERS: Add entry for twl4030 series soc codec driver
Takashi Iwai (6):
ALSA: hda - Simplify AD1986A mixer definitions
ALSA: hda - Generalize the pin-detect quirk for Lenovo N100
ALSA: hda - Fix support for Samsung P50 with AD1986A codec
ALSA: hda - Add pin-sense trigger when needed for Realtek codecs
ALSA: hda - Use model=acer-aspire-6530g for Acer Aspire 6930G
ALSA: hda - Add missing initializations for ALC268 and ALC269
Tim Blechmann (1):
ALSA: lx6464es - configure ethersound io channels
Tony Vroon (1):
ALSA: hda - Line In for Acer Inspire 6530G model
--- Documentation/sound/alsa/HD-Audio-Models.txt | 1 + MAINTAINERS | 7 ++ sound/isa/cmi8330.c | 2 +- sound/oss/kahlua.c | 2 +- sound/oss/mpu401.c | 16 +--- sound/pci/atiixp.c | 8 +- sound/pci/atiixp_modem.c | 4 +- sound/pci/au88x0/au8810.c | 3 +- sound/pci/au88x0/au8820.c | 3 +- sound/pci/au88x0/au8830.c | 3 +- sound/pci/ca0106/ca0106_main.c | 2 +- sound/pci/cmipci.c | 10 +- sound/pci/cs4281.c | 2 +- sound/pci/cs46xx/cs46xx.c | 6 +- sound/pci/emu10k1/emu10k1.c | 6 +- sound/pci/emu10k1/emu10k1x.c | 2 +- sound/pci/ens1370.c | 8 +- sound/pci/es1938.c | 2 +- sound/pci/hda/patch_analog.c | 128 ++++++++++++++------------ sound/pci/hda/patch_realtek.c | 46 ++++++++-- sound/pci/ice1712/ice1712.c | 2 +- sound/pci/ice1712/ice1724.c | 2 +- sound/pci/intel8x0.c | 46 +++++----- sound/pci/intel8x0m.c | 34 ++++---- sound/pci/lx6464es/lx6464es.c | 7 +- sound/pci/mixart/mixart.c | 2 +- sound/pci/nm256/nm256.c | 6 +- sound/pci/oxygen/oxygen_mixer.c | 28 ++++-- sound/pci/rme32.c | 9 +- sound/pci/rme96.c | 12 +-- sound/pci/sonicvibes.c | 2 +- sound/pci/via82xx.c | 4 +- sound/pci/via82xx_modem.c | 2 +- sound/pci/ymfpci/ymfpci.c | 12 +- 34 files changed, 233 insertions(+), 196 deletions(-)
Documentation/sound/alsa/HD-Audio-Models.txt +1 -0
@@ -240,6 +240,7 @@ AD1986A laptop-automute 2-channel with EAPD and HP-automute (Lenovo N100) ultra 2-channel with EAPD (Samsung Ultra tablet PC) samsung 2-channel with EAPD (Samsung R65) + samsung-p50 2-channel with HP-automute (Samsung P50) AD1988/AD1988B/AD1989A/AD1989B ==============================
MAINTAINERS +7 -0
@@ -5668,6 +5668,13 @@ F: drivers/misc/tifm* F: drivers/mmc/host/tifm_sd.c F: include/linux/tifm.h +TI TWL4030 SERIES SOC CODEC DRIVER +P: Peter Ujfalusi +M: [email protected] +L: [email protected] (moderated for non-subscribers) +S: Maintained +F: sound/soc/codecs/twl4030* + TIPC NETWORK LAYER P: Per Liden M: [email protected]
sound/isa/cmi8330.c +1 -1
@@ -338,7 +338,7 @@ static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard,return -EBUSY ; acard->mpu =pnp_request_card_device (card, id->devs[2 ].id,NULL ); -if (acard->play ==NULL ) +if (acard->mpu ==NULL )return -EBUSY ; pdev = acard->cap;
sound/oss/kahlua.c +1 -1
@@ -199,7 +199,7 @@ MODULE_LICENSE("GPL");*/ static struct pci_device_id id_tbl[] = { - {PCI_VENDOR_ID_CYRIX ,PCI_DEVICE_ID_CYRIX_5530_AUDIO ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + {PCI_VDEVICE (CYRIX ,PCI_DEVICE_ID_CYRIX_5530_AUDIO ),0 }, { } };
sound/oss/mpu401.c +3 -13
@@ -926,31 +926,21 @@ static struct midi_operations mpu401_midi_operations[MAX_MIDI_DEV];static void mpu401_chk_version (int n,struct mpu_config *devc) {int tmp; -unsigned long flags; devc->version = devc->revision =0 ; -spin_lock_irqsave (&devc->lock,flags); -if ((tmp =mpu_cmd (n,0xAC ,0 )) <0 ) - { -spin_unlock_irqrestore (&devc->lock,flags); + tmp =mpu_cmd (n,0xAC ,0 ); +if (tmp <0 )return ; - }if ((tmp &0xf0 ) >0x20 )/* Why it's larger than 2.x ??? */ - { -spin_unlock_irqrestore (&devc->lock,flags);return ; - } devc->version = tmp; -if ((tmp =mpu_cmd (n,0xAD ,0 )) <0 ) - { +if ((tmp =mpu_cmd (n,0xAD ,0 )) <0 ) { devc->version =0 ; -spin_unlock_irqrestore (&devc->lock,flags);return ; } devc->revision = tmp; -spin_unlock_irqrestore (&devc->lock,flags); }int attach_mpu401 (struct address_info *hw_config,struct module *owner)
sound/pci/atiixp.c +4 -4
@@ -287,10 +287,10 @@ struct atiixp {/* */ static struct pci_device_id snd_atiixp_ids[] = { - {0x1002 ,0x4341 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 },/* SB200 */ - {0x1002 ,0x4361 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 },/* SB300 */ - {0x1002 ,0x4370 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 },/* SB400 */ - {0x1002 ,0x4382 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 },/* SB600 */ + {PCI_VDEVICE (ATI ,0x4341 ),0 },/* SB200 */ + {PCI_VDEVICE (ATI ,0x4361 ),0 },/* SB300 */ + {PCI_VDEVICE (ATI ,0x4370 ),0 },/* SB400 */ + {PCI_VDEVICE (ATI ,0x4382 ),0 },/* SB600 */ {0 , } };
sound/pci/atiixp_modem.c +2 -2
@@ -262,8 +262,8 @@ struct atiixp_modem {/* */ static struct pci_device_id snd_atiixp_ids[] = { - {0x1002 ,0x434d ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 },/* SB200 */ - {0x1002 ,0x4378 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 },/* SB400 */ + {PCI_VDEVICE (ATI ,0x434d ),0 },/* SB200 */ + {PCI_VDEVICE (ATI ,0x4378 ),0 },/* SB400 */ {0 , } };
sound/pci/au88x0/au8810.c +1 -2
@@ -1,8 +1,7 @@#include "au8810.h" #include "au88x0.h" static struct pci_device_id snd_vortex_ids[] = { - {PCI_VENDOR_ID_AUREAL ,PCI_DEVICE_ID_AUREAL_ADVANTAGE , -PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,1 ,}, + {PCI_VDEVICE (AUREAL ,PCI_DEVICE_ID_AUREAL_ADVANTAGE ),1 ,}, {0 ,} };
sound/pci/au88x0/au8820.c +1 -2
@@ -1,8 +1,7 @@#include "au8820.h" #include "au88x0.h" static struct pci_device_id snd_vortex_ids[] = { - {PCI_VENDOR_ID_AUREAL ,PCI_DEVICE_ID_AUREAL_VORTEX_1 , -PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 ,}, + {PCI_VDEVICE (AUREAL ,PCI_DEVICE_ID_AUREAL_VORTEX_1 ),0 ,}, {0 ,} };
sound/pci/au88x0/au8830.c +1 -2
@@ -1,8 +1,7 @@#include "au8830.h" #include "au88x0.h" static struct pci_device_id snd_vortex_ids[] = { - {PCI_VENDOR_ID_AUREAL ,PCI_DEVICE_ID_AUREAL_VORTEX_2 , -PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 ,}, + {PCI_VDEVICE (AUREAL ,PCI_DEVICE_ID_AUREAL_VORTEX_2 ),0 ,}, {0 ,} };
sound/pci/ca0106/ca0106_main.c +1 -1
@@ -1876,7 +1876,7 @@ static int snd_ca0106_resume(struct pci_dev *pci)// PCI IDs static struct pci_device_id snd_ca0106_ids[] = { - {0x1102 ,0x0007 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 },/* Audigy LS or Live 24bit */ + {PCI_VDEVICE (CREATIVE ,0x0007 ),0 },/* Audigy LS or Live 24bit */ {0 , } };MODULE_DEVICE_TABLE (pci, snd_ca0106_ids);
sound/pci/cmipci.c +5 -5
@@ -2797,11 +2797,11 @@ static inline void snd_cmipci_proc_init(struct cmipci *cm) {}static struct pci_device_id snd_cmipci_ids[] = { - {PCI_VENDOR_ID_CMEDIA ,PCI_DEVICE_ID_CMEDIA_CM8338A ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, - {PCI_VENDOR_ID_CMEDIA ,PCI_DEVICE_ID_CMEDIA_CM8338B ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, - {PCI_VENDOR_ID_CMEDIA ,PCI_DEVICE_ID_CMEDIA_CM8738 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, - {PCI_VENDOR_ID_CMEDIA ,PCI_DEVICE_ID_CMEDIA_CM8738B ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, - {PCI_VENDOR_ID_AL ,PCI_DEVICE_ID_CMEDIA_CM8738 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + {PCI_VDEVICE (CMEDIA ,PCI_DEVICE_ID_CMEDIA_CM8338A ),0 }, + {PCI_VDEVICE (CMEDIA ,PCI_DEVICE_ID_CMEDIA_CM8338B ),0 }, + {PCI_VDEVICE (CMEDIA ,PCI_DEVICE_ID_CMEDIA_CM8738 ),0 }, + {PCI_VDEVICE (CMEDIA ,PCI_DEVICE_ID_CMEDIA_CM8738B ),0 }, + {PCI_VDEVICE (AL ,PCI_DEVICE_ID_CMEDIA_CM8738 ),0 }, {0 ,}, };
sound/pci/cs4281.c +1 -1
@@ -495,7 +495,7 @@ struct cs4281 {static irqreturn_t snd_cs4281_interrupt (int irq,void *dev_id);static struct pci_device_id snd_cs4281_ids[] = { - {0x1013 ,0x6005 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 , },/* CS4281 */ + {PCI_VDEVICE (CIRRUS ,0x6005 ),0 , },/* CS4281 */ {0 , } };
sound/pci/cs46xx/cs46xx.c +3 -3
@@ -65,9 +65,9 @@ module_param_array(mmap_valid, bool, NULL, 0444);MODULE_PARM_DESC (mmap_valid,"Support OSS mmap." );static struct pci_device_id snd_cs46xx_ids[] = { - {0x1013 ,0x6001 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 , },/* CS4280 */ - {0x1013 ,0x6003 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 , },/* CS4612 */ - {0x1013 ,0x6004 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 , },/* CS4615 */ + {PCI_VDEVICE (CIRRUS ,0x6001 ),0 , },/* CS4280 */ + {PCI_VDEVICE (CIRRUS ,0x6003 ),0 , },/* CS4612 */ + {PCI_VDEVICE (CIRRUS ,0x6004 ),0 , },/* CS4615 */ {0 , } };
sound/pci/emu10k1/emu10k1.c +3 -3
@@ -77,9 +77,9 @@ MODULE_PARM_DESC(subsystem, "Force card subsystem model.");* Class 0401: 1102:0008 (rev 00) Subsystem: 1102:1001 -> Audigy2 Value Model:SB0400 */ static struct pci_device_id snd_emu10k1_ids[] = { - {0x1102 ,0x0002 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 },/* EMU10K1 */ - {0x1102 ,0x0004 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,1 },/* Audigy */ - {0x1102 ,0x0008 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,1 },/* Audigy 2 Value SB0400 */ + {PCI_VDEVICE (CREATIVE ,0x0002 ),0 },/* EMU10K1 */ + {PCI_VDEVICE (CREATIVE ,0x0004 ),1 },/* Audigy */ + {PCI_VDEVICE (CREATIVE ,0x0008 ),1 },/* Audigy 2 Value SB0400 */ {0 , } };
sound/pci/emu10k1/emu10k1x.c +1 -1
@@ -1607,7 +1607,7 @@ static void __devexit snd_emu10k1x_remove(struct pci_dev *pci)// PCI IDs static struct pci_device_id snd_emu10k1x_ids[] = { - {0x1102 ,0x0006 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 },/* Dell OEM version (EMU10K1) */ + {PCI_VDEVICE (CREATIVE ,0x0006 ),0 },/* Dell OEM version (EMU10K1) */ {0 , } };MODULE_DEVICE_TABLE (pci, snd_emu10k1x_ids);
sound/pci/ens1370.c +4 -4
@@ -445,12 +445,12 @@ static irqreturn_t snd_audiopci_interrupt(int irq, void *dev_id); static struct pci_device_id snd_audiopci_ids[] = { #ifdef CHIP1370 - { 0x1274, 0x5000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1370 */ + { PCI_VDEVICE(ENSONIQ, 0x5000), 0, }, /* ES1370 */ #endif #ifdef CHIP1371 - { 0x1274, 0x1371, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1371 */ - { 0x1274, 0x5880, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1373 - CT5880 */ - { 0x1102, 0x8938, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Ectiva EV1938 */ + { PCI_VDEVICE(ENSONIQ, 0x1371), 0, }, /* ES1371 */ + { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ + { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ #endif { 0, } };
sound/pci/es1938.c +1 -1
@@ -244,7 +244,7 @@ struct es1938 {static irqreturn_t snd_es1938_interrupt (int irq,void *dev_id);static struct pci_device_id snd_es1938_ids[] = { - {0x125d ,0x1969 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 , },/* Solo-1 */ + {PCI_VDEVICE (ESS ,0x1969 ),0 , },/* Solo-1 */ {0 , } };
sound/pci/hda/patch_analog.c +70 -58
221 lines not on this page · raw message
sound/pci/hda/patch_realtek.c +38 -8
125 lines not on this page · raw message
sound/pci/ice1712/ice1712.c +1 -1
@@ -107,7 +107,7 @@ MODULE_PARM_DESC(dxr_enable, "Enable DXR support for Terratec DMX6FIRE.");static const struct pci_device_id snd_ice1712_ids[] = { - {PCI_VENDOR_ID_ICE ,PCI_DEVICE_ID_ICE_1712 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 },/* ICE1712 */ + {PCI_VDEVICE (ICE ,PCI_DEVICE_ID_ICE_1712 ),0 },/* ICE1712 */ {0 , } };
sound/pci/ice1712/ice1724.c +1 -1
@@ -93,7 +93,7 @@ MODULE_PARM_DESC(model, "Use the given board model.");/* Both VT1720 and VT1724 have the same PCI IDs */ static const struct pci_device_id snd_vt1724_ids[] = { - {PCI_VENDOR_ID_ICE ,PCI_DEVICE_ID_VT1724 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + {PCI_VDEVICE (ICE ,PCI_DEVICE_ID_VT1724 ),0 }, {0 , } };
sound/pci/intel8x0.c +23 -23
52 lines not on this page · raw message
sound/pci/intel8x0m.c +17 -17
@@ -220,24 +220,24 @@ struct intel8x0m { };static struct pci_device_id snd_intel8x0m_ids[] = { - {0x8086 ,0x2416 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,DEVICE_INTEL },/* 82801AA */ - {0x8086 ,0x2426 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,DEVICE_INTEL },/* 82901AB */ - {0x8086 ,0x2446 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,DEVICE_INTEL },/* 82801BA */ - {0x8086 ,0x2486 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,DEVICE_INTEL },/* ICH3 */ - {0x8086 ,0x24c6 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,DEVICE_INTEL },/* ICH4 */ - {0x8086 ,0x24d6 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,DEVICE_INTEL },/* ICH5 */ - {0x8086 ,0x266d ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,DEVICE_INTEL },/* ICH6 */ - {0x8086 ,0x27dd ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,DEVICE_INTEL },/* ICH7 */ - {0x8086 ,0x7196 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,DEVICE_INTEL },/* 440MX */ - {0x1022 ,0x7446 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,DEVICE_INTEL },/* AMD768 */ - {0x1039 ,0x7013 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,DEVICE_SIS },/* SI7013 */ - {0x10de ,0x01c1 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,DEVICE_NFORCE },/* NFORCE */ - {0x10de ,0x0069 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,DEVICE_NFORCE },/* NFORCE2 */ - {0x10de ,0x0089 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,DEVICE_NFORCE },/* NFORCE2s */ - {0x10de ,0x00d9 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,DEVICE_NFORCE },/* NFORCE3 */ + {PCI_VDEVICE (INTEL ,0x2416 ),DEVICE_INTEL },/* 82801AA */ + {PCI_VDEVICE (INTEL ,0x2426 ),DEVICE_INTEL },/* 82901AB */ + {PCI_VDEVICE (INTEL ,0x2446 ),DEVICE_INTEL },/* 82801BA */ + {PCI_VDEVICE (INTEL ,0x2486 ),DEVICE_INTEL },/* ICH3 */ + {PCI_VDEVICE (INTEL ,0x24c6 ),DEVICE_INTEL },/* ICH4 */ + {PCI_VDEVICE (INTEL ,0x24d6 ),DEVICE_INTEL },/* ICH5 */ + {PCI_VDEVICE (INTEL ,0x266d ),DEVICE_INTEL },/* ICH6 */ + {PCI_VDEVICE (INTEL ,0x27dd ),DEVICE_INTEL },/* ICH7 */ + {PCI_VDEVICE (INTEL ,0x7196 ),DEVICE_INTEL },/* 440MX */ + {PCI_VDEVICE (AMD ,0x7446 ),DEVICE_INTEL },/* AMD768 */ + {PCI_VDEVICE (SI ,0x7013 ),DEVICE_SIS },/* SI7013 */ + {PCI_VDEVICE (NVIDIA ,0x01c1 ),DEVICE_NFORCE },/* NFORCE */ + {PCI_VDEVICE (NVIDIA ,0x0069 ),DEVICE_NFORCE },/* NFORCE2 */ + {PCI_VDEVICE (NVIDIA ,0x0089 ),DEVICE_NFORCE },/* NFORCE2s */ + {PCI_VDEVICE (NVIDIA ,0x00d9 ),DEVICE_NFORCE },/* NFORCE3 */ #if 0 - {0x1022 ,0x746d ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,DEVICE_INTEL },/* AMD8111 */ - {0x10b9 ,0x5455 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,DEVICE_ALI },/* Ali5455 */ + {PCI_VDEVICE (AMD ,0x746d ),DEVICE_INTEL },/* AMD8111 */ + {PCI_VDEVICE (AL ,0x5455 ),DEVICE_ALI },/* Ali5455 */ #endif {0 , } };
sound/pci/lx6464es/lx6464es.c +3 -4
@@ -654,13 +654,12 @@ static int __devinit lx_init_ethersound_config(struct lx6464es *chip)int i;u32 orig_conf_es =lx_dsp_reg_read (chip, eReg_CONFES); -u32 default_conf_es = (64 <<IOCR_OUTPUTS_OFFSET ) | +/* configure 64 io channels */ +u32 conf_es = (orig_conf_es &CONFES_READ_PART_MASK ) | (64 <<IOCR_INPUTS_OFFSET ) | + (64 <<IOCR_OUTPUTS_OFFSET ) | (FREQ_RATIO_SINGLE_MODE <<FREQ_RATIO_OFFSET ); -u32 conf_es = (orig_conf_es &CONFES_READ_PART_MASK ) - | (default_conf_es &CONFES_WRITE_PART_MASK ); -snd_printdd ("->lx_init_ethersound\n" ); chip->freq_ratio =FREQ_RATIO_SINGLE_MODE ;
sound/pci/mixart/mixart.c +1 -1
@@ -61,7 +61,7 @@ MODULE_PARM_DESC(enable, "Enable Digigram " CARD_NAME " soundcard.");*/ static struct pci_device_id snd_mixart_ids[] = { - {0x1057 ,0x0003 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 , },/* MC8240 */ + {PCI_VDEVICE (MOTOROLA ,0x0003 ),0 , },/* MC8240 */ {0 , } };
sound/pci/nm256/nm256.c +3 -3
@@ -263,9 +263,9 @@ struct nm256 {* PCI ids */ static struct pci_device_id snd_nm256_ids[] = { - {PCI_VENDOR_ID_NEOMAGIC ,PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, - {PCI_VENDOR_ID_NEOMAGIC ,PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, - {PCI_VENDOR_ID_NEOMAGIC ,PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + {PCI_VDEVICE (NEOMAGIC ,PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO ),0 }, + {PCI_VDEVICE (NEOMAGIC ,PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO ),0 }, + {PCI_VDEVICE (NEOMAGIC ,PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO ),0 }, {0 ,}, };
sound/pci/oxygen/oxygen_mixer.c +18 -10
@@ -575,8 +575,10 @@ static int ac97_switch_put(struct snd_kcontrol *ctl,static int ac97_volume_info (struct snd_kcontrol *ctl,struct snd_ctl_elem_info *info) { +int stereo = (ctl->private_value >>16 ) &1 ; + info->type =SNDRV_CTL_ELEM_TYPE_INTEGER ; - info->count =2 ; + info->count = stereo ?2 :1 ; info->value.integer.min =0 ; info->value.integer.max =0x1f ;return 0 ;
@@ -587,6 +589,7 @@ static int ac97_volume_get(struct snd_kcontrol *ctl, {struct oxygen *chip = ctl->private_data;unsigned int codec = (ctl->private_value >>24 ) &1 ; +int stereo = (ctl->private_value >>16 ) &1 ;unsigned int index = ctl->private_value &0xff ;u16 reg;
@@ -594,7 +597,8 @@ static int ac97_volume_get(struct snd_kcontrol *ctl, reg =oxygen_read_ac97 (chip, codec, index);mutex_unlock (&chip->mutex); value->value.integer.value[0 ] =31 - (reg &0x1f ); - value->value.integer.value[1 ] =31 - ((reg >>8 ) &0x1f ); +if (stereo) + value->value.integer.value[1 ] =31 - ((reg >>8 ) &0x1f );return 0 ; }
@@ -603,6 +607,7 @@ static int ac97_volume_put(struct snd_kcontrol *ctl, {struct oxygen *chip = ctl->private_data;unsigned int codec = (ctl->private_value >>24 ) &1 ; +int stereo = (ctl->private_value >>16 ) &1 ;unsigned int index = ctl->private_value &0xff ;u16 oldreg, newreg;int change;
@@ -612,8 +617,11 @@ static int ac97_volume_put(struct snd_kcontrol *ctl, newreg = oldreg; newreg = (newreg & ~0x1f ) | (31 - (value->value.integer.value[0 ] &0x1f )); - newreg = (newreg & ~0x1f00 ) | - ((31 - (value->value.integer.value[0 ] &0x1f )) <<8 ); +if (stereo) + newreg = (newreg & ~0x1f00 ) | + ((31 - (value->value.integer.value[1 ] &0x1f )) <<8 ); +else + newreg = (newreg & ~0x1f00 ) | ((newreg &0x1f ) <<8 ); change = newreg != oldreg;if (change)oxygen_write_ac97 (chip, codec, index, newreg);
@@ -673,7 +681,7 @@ static int ac97_fp_rec_volume_put(struct snd_kcontrol *ctl, .private_value = ((codec) << 24) | ((invert) << 16) | \ ((bitnr) << 8) | (index), \ } -#define AC97_VOLUME (xname, codec, index) { \ +#define AC97_VOLUME (xname, codec, index, stereo) { \ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \ .name = xname, \ .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | \
@@ -682,7 +690,7 @@ static int ac97_fp_rec_volume_put(struct snd_kcontrol *ctl, .get = ac97_volume_get, \ .put = ac97_volume_put, \ .tlv = { .p = ac97_db_scale, }, \ - .private_value = ((codec) << 24) | (index), \ + .private_value = ((codec) << 24) | ((stereo) << 16) | (index), \ } static DECLARE_TLV_DB_SCALE(monitor_db_scale, -1000, 1000, 0);
@@ -882,18 +890,18 @@ static const struct { };static const struct snd_kcontrol_new ac97_controls[] = { -AC97_VOLUME ("Mic Capture Volume" ,0 ,AC97_MIC ), +AC97_VOLUME ("Mic Capture Volume" ,0 ,AC97_MIC ,0 ),AC97_SWITCH ("Mic Capture Switch" ,0 ,AC97_MIC ,15 ,1 ),AC97_SWITCH ("Mic Boost (+20dB)" ,0 ,AC97_MIC ,6 ,0 ),AC97_SWITCH ("Line Capture Switch" ,0 ,AC97_LINE ,15 ,1 ), -AC97_VOLUME ("CD Capture Volume" ,0 ,AC97_CD ), +AC97_VOLUME ("CD Capture Volume" ,0 ,AC97_CD ,1 ),AC97_SWITCH ("CD Capture Switch" ,0 ,AC97_CD ,15 ,1 ), -AC97_VOLUME ("Aux Capture Volume" ,0 ,AC97_AUX ), +AC97_VOLUME ("Aux Capture Volume" ,0 ,AC97_AUX ,1 ),AC97_SWITCH ("Aux Capture Switch" ,0 ,AC97_AUX ,15 ,1 ), };static const struct snd_kcontrol_new ac97_fp_controls[] = { -AC97_VOLUME ("Front Panel Playback Volume" ,1 ,AC97_HEADPHONE ), +AC97_VOLUME ("Front Panel Playback Volume" ,1 ,AC97_HEADPHONE ,1 ),AC97_SWITCH ("Front Panel Playback Switch" ,1 ,AC97_HEADPHONE ,15 ,1 ), { .iface =SNDRV_CTL_ELEM_IFACE_MIXER ,
sound/pci/rme32.c +3 -6
@@ -227,12 +227,9 @@ struct rme32 { };static struct pci_device_id snd_rme32_ids[] = { - {PCI_VENDOR_ID_XILINX_RME ,PCI_DEVICE_ID_RME_DIGI32 , -PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 ,}, - {PCI_VENDOR_ID_XILINX_RME ,PCI_DEVICE_ID_RME_DIGI32_8 , -PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 ,}, - {PCI_VENDOR_ID_XILINX_RME ,PCI_DEVICE_ID_RME_DIGI32_PRO , -PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 ,}, + {PCI_VDEVICE (XILINX_RME ,PCI_DEVICE_ID_RME_DIGI32 ),0 ,}, + {PCI_VDEVICE (XILINX_RME ,PCI_DEVICE_ID_RME_DIGI32_8 ),0 ,}, + {PCI_VDEVICE (XILINX_RME ,PCI_DEVICE_ID_RME_DIGI32_PRO ),0 ,}, {0 ,} };
sound/pci/rme96.c +4 -8
@@ -232,14 +232,10 @@ struct rme96 { };static struct pci_device_id snd_rme96_ids[] = { - {PCI_VENDOR_ID_XILINX ,PCI_DEVICE_ID_RME_DIGI96 , -PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 , }, - {PCI_VENDOR_ID_XILINX ,PCI_DEVICE_ID_RME_DIGI96_8 , -PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 , }, - {PCI_VENDOR_ID_XILINX ,PCI_DEVICE_ID_RME_DIGI96_8_PRO , -PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 , }, - {PCI_VENDOR_ID_XILINX ,PCI_DEVICE_ID_RME_DIGI96_8_PAD_OR_PST , -PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 , }, + {PCI_VDEVICE (XILINX ,PCI_DEVICE_ID_RME_DIGI96 ),0 , }, + {PCI_VDEVICE (XILINX ,PCI_DEVICE_ID_RME_DIGI96_8 ),0 , }, + {PCI_VDEVICE (XILINX ,PCI_DEVICE_ID_RME_DIGI96_8_PRO ),0 , }, + {PCI_VDEVICE (XILINX ,PCI_DEVICE_ID_RME_DIGI96_8_PAD_OR_PST ),0 , }, {0 , } };
sound/pci/sonicvibes.c +1 -1
@@ -243,7 +243,7 @@ struct sonicvibes { };static struct pci_device_id snd_sonic_ids[] = { - {0x5333 ,0xca00 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 , }, + {PCI_VDEVICE (S3 ,0xca00 ),0 , }, {0 , } };
sound/pci/via82xx.c +2 -2
@@ -402,9 +402,9 @@ struct via82xx {static struct pci_device_id snd_via82xx_ids[] = {/* 0x1106, 0x3058 */ - {PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_82C686_5 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,TYPE_CARD_VIA686 , },/* 686A */ + {PCI_VDEVICE (VIA ,PCI_DEVICE_ID_VIA_82C686_5 ),TYPE_CARD_VIA686 , },/* 686A */ /* 0x1106, 0x3059 */ - {PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_8233_5 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,TYPE_CARD_VIA8233 , },/* VT8233 */ + {PCI_VDEVICE (VIA ,PCI_DEVICE_ID_VIA_8233_5 ),TYPE_CARD_VIA8233 , },/* VT8233 */ {0 , } };
sound/pci/via82xx_modem.c +1 -1
@@ -261,7 +261,7 @@ struct via82xx_modem { };static struct pci_device_id snd_via82xx_modem_ids[] = { - {0x1106 ,0x3068 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,TYPE_CARD_VIA82XX_MODEM , }, + {PCI_VDEVICE (VIA ,0x3068 ),TYPE_CARD_VIA82XX_MODEM , }, {0 , } };
sound/pci/ymfpci/ymfpci.c +6 -6
@@ -67,12 +67,12 @@ module_param_array(rear_switch, bool, NULL, 0444);MODULE_PARM_DESC (rear_switch,"Enable shared rear/line-in switch" );static struct pci_device_id snd_ymfpci_ids[] = { - {0x1073 ,0x0004 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 , },/* YMF724 */ - {0x1073 ,0x000d ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 , },/* YMF724F */ - {0x1073 ,0x000a ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 , },/* YMF740 */ - {0x1073 ,0x000c ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 , },/* YMF740C */ - {0x1073 ,0x0010 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 , },/* YMF744 */ - {0x1073 ,0x0012 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 , },/* YMF754 */ + {PCI_VDEVICE (YAMAHA ,0x0004 ),0 , },/* YMF724 */ + {PCI_VDEVICE (YAMAHA ,0x000d ),0 , },/* YMF724F */ + {PCI_VDEVICE (YAMAHA ,0x000a ),0 , },/* YMF740 */ + {PCI_VDEVICE (YAMAHA ,0x000c ),0 , },/* YMF740C */ + {PCI_VDEVICE (YAMAHA ,0x0010 ),0 , },/* YMF744 */ + {PCI_VDEVICE (YAMAHA ,0x0012 ),0 , },/* YMF754 */ {0 , } };