leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ALSA] ice1712 - disable unused ADCs & DACs on DMX6fire

Browse Source 
Modules: ICE1712 driver

Change the value written to hardware configuration register of envy24 chip
in the case of Terratec DMX6fire to restrict the active ADCs & DACs to 6.

Also add the dxr_enable module option to eventually leave the old behaviour
when user requests.

Signed-off-by: Alan Horstmann <gineera@aspect135.co.uk>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
Alan Horstmann 2006-02-08 07:40:33 +01:00 committed by Jaroslav Kysela
parent cc7a59bd8d
commit 531af46279
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sound/pci/ice1712/ice1712.c
View File

@ -87,6 +87,7 @@ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card
static char *model[SNDRV_CARDS]; static char *model[SNDRV_CARDS];
static int omni[SNDRV_CARDS]; /* Delta44 & 66 Omni I/O support */ static int omni[SNDRV_CARDS]; /* Delta44 & 66 Omni I/O support */
static int cs8427_timeout[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 500}; /* CS8427 S/PDIF transciever reset timeout value in msec */ static int cs8427_timeout[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 500}; /* CS8427 S/PDIF transciever reset timeout value in msec */
static int dxr_enable[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 500}; /* DXR enable for DMX6FIRE */
module_param_array(index, int, NULL, 0444); module_param_array(index, int, NULL, 0444);
MODULE_PARM_DESC(index, "Index value for ICE1712 soundcard."); MODULE_PARM_DESC(index, "Index value for ICE1712 soundcard.");
@ -100,6 +101,8 @@ module_param_array(cs8427_timeout, int, NULL, 0444);
MODULE_PARM_DESC(cs8427_timeout, "Define reset timeout for cs8427 chip in msec resolution."); MODULE_PARM_DESC(cs8427_timeout, "Define reset timeout for cs8427 chip in msec resolution.");
module_param_array(model, charp, NULL, 0444); module_param_array(model, charp, NULL, 0444);
MODULE_PARM_DESC(model, "Use the given board model."); MODULE_PARM_DESC(model, "Use the given board model.");
module_param_array(dxr_enable, int, NULL, 0444);
MODULE_PARM_DESC(dsr_enable, "Enable DXR support for Terratec DMX6FIRE.");
static struct pci_device_id snd_ice1712_ids[] = { static struct pci_device_id snd_ice1712_ids[] = {
@ -2390,7 +2393,13 @@ static int __devinit snd_ice1712_chip_init(struct snd_ice1712 *ice)
udelay(200); udelay(200);
outb(ICE1712_NATIVE, ICEREG(ice, CONTROL)); outb(ICE1712_NATIVE, ICEREG(ice, CONTROL));
udelay(200); udelay(200);
pci_write_config_byte(ice->pci, 0x60, ice->eeprom.data[ICE_EEP1_CODEC]); if (ice->eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE && !ice->dxr_enable) {
/* Limit active ADCs and DACs to 6; */
/* Note: DXR extension not supported */
pci_write_config_byte(ice->pci, 0x60, 0x0a);
} else {
pci_write_config_byte(ice->pci, 0x60, ice->eeprom.data[ICE_EEP1_CODEC]);
}
pci_write_config_byte(ice->pci, 0x61, ice->eeprom.data[ICE_EEP1_ACLINK]); pci_write_config_byte(ice->pci, 0x61, ice->eeprom.data[ICE_EEP1_ACLINK]);
pci_write_config_byte(ice->pci, 0x62, ice->eeprom.data[ICE_EEP1_I2SID]); pci_write_config_byte(ice->pci, 0x62, ice->eeprom.data[ICE_EEP1_I2SID]);
pci_write_config_byte(ice->pci, 0x63, ice->eeprom.data[ICE_EEP1_SPDIF]); pci_write_config_byte(ice->pci, 0x63, ice->eeprom.data[ICE_EEP1_SPDIF]);
@ -2526,6 +2535,7 @@ static int __devinit snd_ice1712_create(struct snd_card *card,
const char *modelname, const char *modelname,
int omni, int omni,
int cs8427_timeout, int cs8427_timeout,
int dxr_enable,
struct snd_ice1712 ** r_ice1712) struct snd_ice1712 ** r_ice1712)
{ {
struct snd_ice1712 *ice; struct snd_ice1712 *ice;
@ -2558,6 +2568,7 @@ static int __devinit snd_ice1712_create(struct snd_card *card,
else if (cs8427_timeout > 1000) else if (cs8427_timeout > 1000)
cs8427_timeout = 1000; cs8427_timeout = 1000;
ice->cs8427_timeout = cs8427_timeout; ice->cs8427_timeout = cs8427_timeout;
ice->dxr_enable = dxr_enable;
spin_lock_init(&ice->reg_lock); spin_lock_init(&ice->reg_lock);
mutex_init(&ice->gpio_mutex); mutex_init(&ice->gpio_mutex);
mutex_init(&ice->i2c_mutex); mutex_init(&ice->i2c_mutex);
@ -2660,7 +2671,8 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
strcpy(card->shortname, "ICEnsemble ICE1712"); strcpy(card->shortname, "ICEnsemble ICE1712");
if ((err = snd_ice1712_create(card, pci, model[dev], omni[dev], if ((err = snd_ice1712_create(card, pci, model[dev], omni[dev],
cs8427_timeout[dev], &ice)) < 0) { cs8427_timeout[dev], dxr_enable[dev],
&ice)) < 0) {
snd_card_free(card); snd_card_free(card);
return err; return err;
} }

1
sound/pci/ice1712/ice1712.h
View File

@ -325,6 +325,7 @@ struct snd_ice1712 {
unsigned int pro_volumes[20]; unsigned int pro_volumes[20];
unsigned int omni: 1; /* Delta Omni I/O */ unsigned int omni: 1; /* Delta Omni I/O */
unsigned int dxr_enable: 1; /* Terratec DXR enable for DMX6FIRE */
unsigned int vt1724: 1; unsigned int vt1724: 1;
unsigned int vt1720: 1; unsigned int vt1720: 1;
unsigned int has_spdif: 1; /* VT1720/4 - has SPDIF I/O */ unsigned int has_spdif: 1; /* VT1720/4 - has SPDIF I/O */