Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 189bc171 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] ice1712 - Reorganize existing eeprom data 



Reorganize EEPROM data (in C99 style).
Signed-of-by: default avatarPhilipp Matthias Hahn <pmhahn@pmhahn.de>

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent bcb4d788

sound/pci/ice1712/aureon.c

+41 −71
Original line number Diff line number Diff line
@@ -2110,84 +2110,54 @@ static int __devinit aureon_init(struct snd_ice1712 *ice) 
 */



static unsigned char aureon51_eeprom[] __devinitdata = {

	0x0a,	/* SYSCONF: clock 512, spdif-in/ADC, 3DACs */

	0x80,	/* ACLINK: I2S */

	0xfc,	/* I2S: vol, 96k, 24bit, 192k */

	0xc3,	/* SPDIF: out-en, out-int, spdif-in */

	0xff,	/* GPIO_DIR */

	0xff,	/* GPIO_DIR1 */

	0x5f,	/* GPIO_DIR2 */

	0x00,	/* GPIO_MASK */

	0x00,	/* GPIO_MASK1 */

	0x00,	/* GPIO_MASK2 */

	0x00,	/* GPIO_STATE */

	0x00,	/* GPIO_STATE1 */

	0x00,	/* GPIO_STATE2 */

	[ICE_EEP2_SYSCONF]     = 0x0a,	/* clock 512, spdif-in/ADC, 3DACs */

	[ICE_EEP2_ACLINK]      = 0x80,	/* I2S */

	[ICE_EEP2_I2S]         = 0xfc,	/* vol, 96k, 24bit, 192k */

	[ICE_EEP2_SPDIF]       = 0xc3,	/* out-en, out-int, spdif-in */

	[ICE_EEP2_GPIO_DIR]    = 0xff,

	[ICE_EEP2_GPIO_DIR1]   = 0xff,

	[ICE_EEP2_GPIO_DIR2]   = 0x5f,

	[ICE_EEP2_GPIO_MASK]   = 0x00,

	[ICE_EEP2_GPIO_MASK1]  = 0x00,

	[ICE_EEP2_GPIO_MASK2]  = 0x00,

	[ICE_EEP2_GPIO_STATE]  = 0x00,

	[ICE_EEP2_GPIO_STATE1] = 0x00,

	[ICE_EEP2_GPIO_STATE2] = 0x00,

};



static unsigned char aureon71_eeprom[] __devinitdata = {

	0x0b,	/* SYSCONF: clock 512, spdif-in/ADC, 4DACs */

	0x80,	/* ACLINK: I2S */

	0xfc,	/* I2S: vol, 96k, 24bit, 192k */

	0xc3,	/* SPDIF: out-en, out-int, spdif-in */

	0xff,	/* GPIO_DIR */

	0xff,	/* GPIO_DIR1 */

	0x5f,	/* GPIO_DIR2 */

	0x00,	/* GPIO_MASK */

	0x00,	/* GPIO_MASK1 */

	0x00,	/* GPIO_MASK2 */

	0x00,	/* GPIO_STATE */

	0x00,	/* GPIO_STATE1 */

	0x00,	/* GPIO_STATE2 */

};



static unsigned char prodigy71_eeprom[] __devinitdata = {

	0x0b,	/* SYSCONF: clock 512, spdif-in/ADC, 4DACs */

	0x80,	/* ACLINK: I2S */

	0xfc,	/* I2S: vol, 96k, 24bit, 192k */

	0xc3,	/* SPDIF: out-en, out-int, spdif-in */

	0xff,	/* GPIO_DIR */

	0xff,	/* GPIO_DIR1 */

	0x5f,	/* GPIO_DIR2 */

	0x00,	/* GPIO_MASK */

	0x00,	/* GPIO_MASK1 */

	0x00,	/* GPIO_MASK2 */

	0x00,	/* GPIO_STATE */

	0x00,	/* GPIO_STATE1 */

	0x00,	/* GPIO_STATE2 */

	[ICE_EEP2_SYSCONF]     = 0x0b,	/* clock 512, spdif-in/ADC, 4DACs */

	[ICE_EEP2_ACLINK]      = 0x80,	/* I2S */

	[ICE_EEP2_I2S]         = 0xfc,	/* vol, 96k, 24bit, 192k */

	[ICE_EEP2_SPDIF]       = 0xc3,	/* out-en, out-int, spdif-in */

	[ICE_EEP2_GPIO_DIR]    = 0xff,

	[ICE_EEP2_GPIO_DIR1]   = 0xff,

	[ICE_EEP2_GPIO_DIR2]   = 0x5f,

	[ICE_EEP2_GPIO_MASK]   = 0x00,

	[ICE_EEP2_GPIO_MASK1]  = 0x00,

	[ICE_EEP2_GPIO_MASK2]  = 0x00,

	[ICE_EEP2_GPIO_STATE]  = 0x00,

	[ICE_EEP2_GPIO_STATE1] = 0x00,

	[ICE_EEP2_GPIO_STATE2] = 0x00,

};

#define prodigy71_eeprom aureon71_eeprom



static unsigned char prodigy71lt_eeprom[] __devinitdata = {

	0x4b,	/* SYSCINF: clock 512, spdif-in/ADC, 4DACs */

	0x80,	/* ACLINK: I2S */

	0xfc,	/* I2S: vol, 96k, 24bit, 192k */

	0xc3,	/* SPDIF: out-en, out-int, spdif-in */

	0xff,	/* GPIO_DIR */

	0xff,	/* GPIO_DIR1 */

	0x5f,	/* GPIO_DIR2 */

	0x00,	/* GPIO_MASK */

	0x00,	/* GPIO_MASK1 */

	0x00,	/* GPIO_MASK2 */

	0x00,	/* GPIO_STATE */

	0x00,	/* GPIO_STATE1 */

	0x00,	/* GPIO_STATE2 */

};



static unsigned char prodigy71xt_eeprom[] __devinitdata = {

	0x4b,	/* SYSCINF: clock 512, spdif-in/ADC, 4DACs */

	0x80,	/* ACLINK: I2S */

	0xfc,	/* I2S: vol, 96k, 24bit, 192k */

	0xc3,	/* SPDIF: out-en, out-int, spdif-in */

	0xff,	/* GPIO_DIR */

	0xff,	/* GPIO_DIR1 */

	0x5f,	/* GPIO_DIR2 */

	0x00,	/* GPIO_MASK */

	0x00,	/* GPIO_MASK1 */

	0x00,	/* GPIO_MASK2 */

	0x00,	/* GPIO_STATE */

	0x00,	/* GPIO_STATE1 */

	0x00,	/* GPIO_STATE2 */

	[ICE_EEP2_SYSCONF]     = 0x4b,	/* clock 384, spdif-in/ADC, 4DACs */

	[ICE_EEP2_ACLINK]      = 0x80,	/* I2S */

	[ICE_EEP2_I2S]         = 0xfc,	/* vol, 96k, 24bit, 192k */

	[ICE_EEP2_SPDIF]       = 0xc3,	/* out-en, out-int, spdif-in */

	[ICE_EEP2_GPIO_DIR]    = 0xff,

	[ICE_EEP2_GPIO_DIR1]   = 0xff,

	[ICE_EEP2_GPIO_DIR2]   = 0x5f,

	[ICE_EEP2_GPIO_MASK]   = 0x00,

	[ICE_EEP2_GPIO_MASK1]  = 0x00,

	[ICE_EEP2_GPIO_MASK2]  = 0x00,

	[ICE_EEP2_GPIO_STATE]  = 0x00,

	[ICE_EEP2_GPIO_STATE1] = 0x00,

	[ICE_EEP2_GPIO_STATE2] = 0x00,

};

#define prodigy71xt_eeprom prodigy71lt_eeprom



/* entry point */

struct snd_ice1712_card_info snd_vt1724_aureon_cards[] __devinitdata = {

sound/pci/ice1712/juli.c

+13 −13
Original line number Diff line number Diff line
@@ -207,19 +207,19 @@ static int __devinit juli_init(struct snd_ice1712 *ice) 
 */



static unsigned char juli_eeprom[] __devinitdata = {

	0x20,	/* SYSCONF: clock 512, mpu401, 1xADC, 1xDACs */

	0x80,	/* ACLINK: I2S */

	0xf8,	/* I2S: vol, 96k, 24bit, 192k */

	0xc3,	/* SPDIF: out-en, out-int, spdif-in */

	0x9f,	/* GPIO_DIR */

	0xff,	/* GPIO_DIR1 */

	0x7f,	/* GPIO_DIR2 */

	0x9f,	/* GPIO_MASK */

	0xff,	/* GPIO_MASK1 */

	0x7f,	/* GPIO_MASK2 */

	0x16,	/* GPIO_STATE: internal clock, multiple 1x, 48kHz */

	0x80,	/* GPIO_STATE1: mute */

	0x00,	/* GPIO_STATE2 */

	[ICE_EEP2_SYSCONF]     = 0x20,	/* clock 512, mpu401, 1xADC, 1xDACs */

	[ICE_EEP2_ACLINK]      = 0x80,	/* I2S */

	[ICE_EEP2_I2S]         = 0xf8,	/* vol, 96k, 24bit, 192k */

	[ICE_EEP2_SPDIF]       = 0xc3,	/* out-en, out-int, spdif-in */

	[ICE_EEP2_GPIO_DIR]    = 0x9f,

	[ICE_EEP2_GPIO_DIR1]   = 0xff,

	[ICE_EEP2_GPIO_DIR2]   = 0x7f,

	[ICE_EEP2_GPIO_MASK]   = 0x9f,

	[ICE_EEP2_GPIO_MASK1]  = 0xff,

	[ICE_EEP2_GPIO_MASK2]  = 0x7f,

	[ICE_EEP2_GPIO_STATE]  = 0x16,	/* internal clock, multiple 1x, 48kHz */

	[ICE_EEP2_GPIO_STATE1] = 0x80,	/* mute */

	[ICE_EEP2_GPIO_STATE2] = 0x00,

};



/* entry point */

sound/pci/ice1712/phase.c

+26 −26
Original line number Diff line number Diff line
@@ -153,35 +153,35 @@ static int __devinit phase22_add_controls(struct snd_ice1712 *ice) 
}



static unsigned char phase22_eeprom[] __devinitdata = {

	0x00,	/* SYSCONF: 1xADC, 1xDACs */

	0x80,	/* ACLINK: I2S */

	0xf8,	/* I2S: vol, 96k, 24bit*/

	0xc3,	/* SPDIF: out-en, out-int, spdif-in */

	0xFF,	/* GPIO_DIR */

	0xFF,	/* GPIO_DIR1 */

	0xFF,	/* GPIO_DIR2 */

	0x00,	/* GPIO_MASK */

	0x00,	/* GPIO_MASK1 */

	0x00,	/* GPIO_MASK2 */

	0x00,	/* GPIO_STATE: */

	0x00,	/* GPIO_STATE1: */

	0x00,	/* GPIO_STATE2 */

	[ICE_EEP2_SYSCONF]     = 0x00,	/* 1xADC, 1xDACs */

	[ICE_EEP2_ACLINK]      = 0x80,	/* I2S */

	[ICE_EEP2_I2S]         = 0xf8,	/* vol, 96k, 24bit */

	[ICE_EEP2_SPDIF]       = 0xc3,	/* out-en, out-int, spdif-in */

	[ICE_EEP2_GPIO_DIR]    = 0xff,

	[ICE_EEP2_GPIO_DIR1]   = 0xff,

	[ICE_EEP2_GPIO_DIR2]   = 0xff,

	[ICE_EEP2_GPIO_MASK]   = 0x00,

	[ICE_EEP2_GPIO_MASK1]  = 0x00,

	[ICE_EEP2_GPIO_MASK2]  = 0x00,

	[ICE_EEP2_GPIO_STATE]  = 0x00,

	[ICE_EEP2_GPIO_STATE1] = 0x00,

	[ICE_EEP2_GPIO_STATE2] = 0x00,

};



static unsigned char phase28_eeprom[] __devinitdata = {

	0x0b,	/* SYSCONF: clock 512, spdif-in/ADC, 4DACs */

	0x80,	/* ACLINK: I2S */

	0xfc,	/* I2S: vol, 96k, 24bit, 192k */

	0xc3,	/* SPDIF: out-en, out-int, spdif-in */

	0xff,	/* GPIO_DIR */

	0xff,	/* GPIO_DIR1 */

	0x5f,	/* GPIO_DIR2 */

	0x00,	/* GPIO_MASK */

	0x00,	/* GPIO_MASK1 */

	0x00,	/* GPIO_MASK2 */

	0x00,	/* GPIO_STATE */

	0x00,	/* GPIO_STATE1 */

	0x00,	/* GPIO_STATE2 */

	[ICE_EEP2_SYSCONF]     = 0x0b,	/* clock 512, spdif-in/ADC, 4DACs */

	[ICE_EEP2_ACLINK]      = 0x80,	/* I2S */

	[ICE_EEP2_I2S]         = 0xfc,	/* vol, 96k, 24bit, 192k */

	[ICE_EEP2_SPDIF]       = 0xc3,	/* out-en, out-int, spdif-in */

	[ICE_EEP2_GPIO_DIR]    = 0xff,

	[ICE_EEP2_GPIO_DIR1]   = 0xff,

	[ICE_EEP2_GPIO_DIR2]   = 0x5f,

	[ICE_EEP2_GPIO_MASK]   = 0x00,

	[ICE_EEP2_GPIO_MASK1]  = 0x00,

	[ICE_EEP2_GPIO_MASK2]  = 0x00,

	[ICE_EEP2_GPIO_STATE]  = 0x00,

	[ICE_EEP2_GPIO_STATE1] = 0x00,

	[ICE_EEP2_GPIO_STATE2] = 0x00,

};



/*

sound/pci/ice1712/pontis.c

+13 −13
Original line number Diff line number Diff line
@@ -827,19 +827,19 @@ static int __devinit pontis_init(struct snd_ice1712 *ice) 
 */



static unsigned char pontis_eeprom[] __devinitdata = {

	0x08,	/* SYSCONF: clock 256, mpu401, spdif-in/ADC, 1DAC */

	0x80,	/* ACLINK: I2S */

	0xf8,	/* I2S: vol, 96k, 24bit, 192k */

	0xc3,	/* SPDIF: out-en, out-int, spdif-in */

	0x07,	/* GPIO_DIR */

	0x00,	/* GPIO_DIR1 */

	0x00,	/* GPIO_DIR2 (ignored) */

	0x0f,	/* GPIO_MASK (4-7 reserved for CS8416) */

	0xff,	/* GPIO_MASK1 */

	0x00,	/* GPIO_MASK2 (ignored) */

	0x06,	/* GPIO_STATE (0-low, 1-high, 2-high) */

	0x00,	/* GPIO_STATE1 */

	0x00,	/* GPIO_STATE2 (ignored) */

	[ICE_EEP2_SYSCONF]     = 0x08,	/* clock 256, mpu401, spdif-in/ADC, 1DAC */

	[ICE_EEP2_ACLINK]      = 0x80,	/* I2S */

	[ICE_EEP2_I2S]         = 0xf8,	/* vol, 96k, 24bit, 192k */

	[ICE_EEP2_SPDIF]       = 0xc3,	/* out-en, out-int, spdif-in */

	[ICE_EEP2_GPIO_DIR]    = 0x07,

	[ICE_EEP2_GPIO_DIR1]   = 0x00,

	[ICE_EEP2_GPIO_DIR2]   = 0x00,	/* ignored */

	[ICE_EEP2_GPIO_MASK]   = 0x0f,	/* 4-7 reserved for CS8416 */

	[ICE_EEP2_GPIO_MASK1]  = 0xff,

	[ICE_EEP2_GPIO_MASK2]  = 0x00,	/* ignored */

	[ICE_EEP2_GPIO_STATE]  = 0x06,	/* 0-low, 1-high, 2-high */

	[ICE_EEP2_GPIO_STATE1] = 0x00,

	[ICE_EEP2_GPIO_STATE2] = 0x00,	/* ignored */

};



/* entry point */

sound/pci/ice1712/prodigy192.c

+13 −13
Original line number Diff line number Diff line
@@ -507,19 +507,19 @@ static int __devinit prodigy192_init(struct snd_ice1712 *ice) 
 */



static unsigned char prodigy71_eeprom[] __devinitdata = {

	0x2b,	/* SYSCONF: clock 512, mpu401, spdif-in/ADC, 4DACs */

	0x80,	/* ACLINK: I2S */

	0xf8,	/* I2S: vol, 96k, 24bit, 192k */

	0xc3,	/* SPDIF: out-en, out-int, spdif-in */

	0xff,	/* GPIO_DIR */

	0xff,	/* GPIO_DIR1 */

	0xbf,	/* GPIO_DIR2 */

	0x00,	/* GPIO_MASK */

	0x00,	/* GPIO_MASK1 */

	0x00,	/* GPIO_MASK2 */

	0x00,	/* GPIO_STATE */

	0x00,	/* GPIO_STATE1 */

	0x00,	/* GPIO_STATE2 */

	[ICE_EEP2_SYSCONF]     = 0x2b,	/* clock 512, mpu401, spdif-in/ADC, 4DACs */

	[ICE_EEP2_ACLINK]      = 0x80,	/* I2S */

	[ICE_EEP2_I2S]         = 0xf8,	/* vol, 96k, 24bit, 192k */

	[ICE_EEP2_SPDIF]       = 0xc3,	/* out-en, out-int, spdif-in */

	[ICE_EEP2_GPIO_DIR]    = 0xff,

	[ICE_EEP2_GPIO_DIR1]   = 0xff,

	[ICE_EEP2_GPIO_DIR2]   = 0xbf,

	[ICE_EEP2_GPIO_MASK]   = 0x00,

	[ICE_EEP2_GPIO_MASK1]  = 0x00,

	[ICE_EEP2_GPIO_MASK2]  = 0x00,

	[ICE_EEP2_GPIO_STATE]  = 0x00,

	[ICE_EEP2_GPIO_STATE1] = 0x00,

	[ICE_EEP2_GPIO_STATE2] = 0x00,

};