Skip to content

L
linux-davinci
Commit 980f31c4 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

Merge branch 'topic/ice1724-quartet' into topic/hda

parents 9e298f44 6ef80706
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2326 additions and 85 deletions
include/sound/ak4113.h 0 → 100644
View file @ 980f31c4
This diff is collapsed.
include/sound/ak4114.h
View file @ 980f31c4
...@@ -95,13 +95,13 @@ ...@@ -95,13 +95,13 @@
/* AK4114_REG_IO0 */ /* AK4114_REG_IO0 */
#define AK4114_TX1E (1<<7) /* TX1 Output Enable (1 = enable) */ #define AK4114_TX1E (1<<7) /* TX1 Output Enable (1 = enable) */
#define AK4114_OPS12 (1<<2) /* Output Though Data Selector for TX1 pin */ #define AK4114_OPS12 (1<<6) /* Output Data Selector for TX1 pin */
#define AK4114_OPS11 (1<<1) /* Output Though Data Selector for TX1 pin */ #define AK4114_OPS11 (1<<5) /* Output Data Selector for TX1 pin */
#define AK4114_OPS10 (1<<0) /* Output Though Data Selector for TX1 pin */ #define AK4114_OPS10 (1<<4) /* Output Data Selector for TX1 pin */
#define AK4114_TX0E (1<<3) /* TX0 Output Enable (1 = enable) */ #define AK4114_TX0E (1<<3) /* TX0 Output Enable (1 = enable) */
#define AK4114_OPS02 (1<<2) /* Output Though Data Selector for TX0 pin */ #define AK4114_OPS02 (1<<2) /* Output Data Selector for TX0 pin */
#define AK4114_OPS01 (1<<1) /* Output Though Data Selector for TX0 pin */ #define AK4114_OPS01 (1<<1) /* Output Data Selector for TX0 pin */
#define AK4114_OPS00 (1<<0) /* Output Though Data Selector for TX0 pin */ #define AK4114_OPS00 (1<<0) /* Output Data Selector for TX0 pin */
/* AK4114_REG_IO1 */ /* AK4114_REG_IO1 */
#define AK4114_EFH1 (1<<7) /* Interrupt 0 pin Hold */ #define AK4114_EFH1 (1<<7) /* Interrupt 0 pin Hold */
......
include/sound/ak4xxx-adda.h
View file @ 980f31c4
...@@ -68,7 +68,7 @@ struct snd_akm4xxx { ...@@ -68,7 +68,7 @@ struct snd_akm4xxx {
enum { enum {
SND_AK4524, SND_AK4528, SND_AK4529, SND_AK4524, SND_AK4528, SND_AK4529,
SND_AK4355, SND_AK4358, SND_AK4381, SND_AK4355, SND_AK4358, SND_AK4381,
SND_AK5365 SND_AK5365, SND_AK4620,
} type; } type;
/* (array) information of combined codecs */ /* (array) information of combined codecs */
...@@ -76,6 +76,9 @@ struct snd_akm4xxx { ...@@ -76,6 +76,9 @@ struct snd_akm4xxx {
const struct snd_akm4xxx_adc_channel *adc_info; const struct snd_akm4xxx_adc_channel *adc_info;
struct snd_ak4xxx_ops ops; struct snd_ak4xxx_ops ops;
unsigned int num_chips;
unsigned int total_regs;
const char *name;
}; };
void snd_akm4xxx_write(struct snd_akm4xxx *ak, int chip, unsigned char reg, void snd_akm4xxx_write(struct snd_akm4xxx *ak, int chip, unsigned char reg,
......
sound/i2c/other/Makefile
View file @ 980f31c4
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
snd-ak4114-objs := ak4114.o snd-ak4114-objs := ak4114.o
snd-ak4117-objs := ak4117.o snd-ak4117-objs := ak4117.o
snd-ak4113-objs := ak4113.o
snd-ak4xxx-adda-objs := ak4xxx-adda.o snd-ak4xxx-adda-objs := ak4xxx-adda.o
snd-pt2258-objs := pt2258.o snd-pt2258-objs := pt2258.o
snd-tea575x-tuner-objs := tea575x-tuner.o snd-tea575x-tuner-objs := tea575x-tuner.o
...@@ -12,5 +13,5 @@ snd-tea575x-tuner-objs := tea575x-tuner.o ...@@ -12,5 +13,5 @@ snd-tea575x-tuner-objs := tea575x-tuner.o
# Module Dependency # Module Dependency
obj-$(CONFIG_SND_PDAUDIOCF) += snd-ak4117.o obj-$(CONFIG_SND_PDAUDIOCF) += snd-ak4117.o
obj-$(CONFIG_SND_ICE1712) += snd-ak4xxx-adda.o obj-$(CONFIG_SND_ICE1712) += snd-ak4xxx-adda.o
obj-$(CONFIG_SND_ICE1724) += snd-ak4114.o snd-ak4xxx-adda.o snd-pt2258.o obj-$(CONFIG_SND_ICE1724) += snd-ak4114.o snd-ak4113.o snd-ak4xxx-adda.o snd-pt2258.o
obj-$(CONFIG_SND_FM801_TEA575X) += snd-tea575x-tuner.o obj-$(CONFIG_SND_FM801_TEA575X) += snd-tea575x-tuner.o
sound/i2c/other/ak4113.c 0 → 100644
View file @ 980f31c4
This diff is collapsed.
sound/i2c/other/ak4xxx-adda.c
View file @ 980f31c4
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <sound/control.h> #include <sound/control.h>
#include <sound/tlv.h> #include <sound/tlv.h>
#include <sound/ak4xxx-adda.h> #include <sound/ak4xxx-adda.h>
#include <sound/info.h>
MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>"); MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>");
MODULE_DESCRIPTION("Routines for control of AK452x / AK43xx AD/DA converters"); MODULE_DESCRIPTION("Routines for control of AK452x / AK43xx AD/DA converters");
...@@ -52,26 +53,21 @@ EXPORT_SYMBOL(snd_akm4xxx_write); ...@@ -52,26 +53,21 @@ EXPORT_SYMBOL(snd_akm4xxx_write);
static void ak4524_reset(struct snd_akm4xxx *ak, int state) static void ak4524_reset(struct snd_akm4xxx *ak, int state)
{ {
unsigned int chip; unsigned int chip;
unsigned char reg, maxreg; unsigned char reg;
if (ak->type == SND_AK4528)
maxreg = 0x06;
else
maxreg = 0x08;
for (chip = 0; chip < ak->num_dacs/2; chip++) { for (chip = 0; chip < ak->num_dacs/2; chip++) {
snd_akm4xxx_write(ak, chip, 0x01, state ? 0x00 : 0x03); snd_akm4xxx_write(ak, chip, 0x01, state ? 0x00 : 0x03);
if (state) if (state)
continue; continue;
/* DAC volumes */ /* DAC volumes */
for (reg = 0x04; reg < maxreg; reg++) for (reg = 0x04; reg < ak->total_regs; reg++)
snd_akm4xxx_write(ak, chip, reg, snd_akm4xxx_write(ak, chip, reg,
snd_akm4xxx_get(ak, chip, reg)); snd_akm4xxx_get(ak, chip, reg));
} }
} }
/* reset procedure for AK4355 and AK4358 */ /* reset procedure for AK4355 and AK4358 */
static void ak435X_reset(struct snd_akm4xxx *ak, int state, static void ak435X_reset(struct snd_akm4xxx *ak, int state)
unsigned char total_regs)
{ {
unsigned char reg; unsigned char reg;
...@@ -79,7 +75,7 @@ static void ak435X_reset(struct snd_akm4xxx *ak, int state, ...@@ -79,7 +75,7 @@ static void ak435X_reset(struct snd_akm4xxx *ak, int state,
snd_akm4xxx_write(ak, 0, 0x01, 0x02); /* reset and soft-mute */ snd_akm4xxx_write(ak, 0, 0x01, 0x02); /* reset and soft-mute */
return; return;
} }
for (reg = 0x00; reg < total_regs; reg++) for (reg = 0x00; reg < ak->total_regs; reg++)
if (reg != 0x01) if (reg != 0x01)
snd_akm4xxx_write(ak, 0, reg, snd_akm4xxx_write(ak, 0, reg,
snd_akm4xxx_get(ak, 0, reg)); snd_akm4xxx_get(ak, 0, reg));
...@@ -91,12 +87,11 @@ static void ak4381_reset(struct snd_akm4xxx *ak, int state) ...@@ -91,12 +87,11 @@ static void ak4381_reset(struct snd_akm4xxx *ak, int state)
{ {
unsigned int chip; unsigned int chip;
unsigned char reg; unsigned char reg;
for (chip = 0; chip < ak->num_dacs/2; chip++) { for (chip = 0; chip < ak->num_dacs/2; chip++) {
snd_akm4xxx_write(ak, chip, 0x00, state ? 0x0c : 0x0f); snd_akm4xxx_write(ak, chip, 0x00, state ? 0x0c : 0x0f);
if (state) if (state)
continue; continue;
for (reg = 0x01; reg < 0x05; reg++) for (reg = 0x01; reg < ak->total_regs; reg++)
snd_akm4xxx_write(ak, chip, reg, snd_akm4xxx_write(ak, chip, reg,
snd_akm4xxx_get(ak, chip, reg)); snd_akm4xxx_get(ak, chip, reg));
} }
...@@ -113,16 +108,17 @@ void snd_akm4xxx_reset(struct snd_akm4xxx *ak, int state) ...@@ -113,16 +108,17 @@ void snd_akm4xxx_reset(struct snd_akm4xxx *ak, int state)
switch (ak->type) { switch (ak->type) {
case SND_AK4524: case SND_AK4524:
case SND_AK4528: case SND_AK4528:
case SND_AK4620:
ak4524_reset(ak, state); ak4524_reset(ak, state);
break; break;
case SND_AK4529: case SND_AK4529:
/* FIXME: needed for ak4529? */ /* FIXME: needed for ak4529? */
break; break;
case SND_AK4355: case SND_AK4355:
ak435X_reset(ak, state, 0x0b); ak435X_reset(ak, state);
break; break;
case SND_AK4358: case SND_AK4358:
ak435X_reset(ak, state, 0x10); ak435X_reset(ak, state);
break; break;
case SND_AK4381: case SND_AK4381:
ak4381_reset(ak, state); ak4381_reset(ak, state);
...@@ -139,7 +135,7 @@ EXPORT_SYMBOL(snd_akm4xxx_reset); ...@@ -139,7 +135,7 @@ EXPORT_SYMBOL(snd_akm4xxx_reset);
* Volume conversion table for non-linear volumes * Volume conversion table for non-linear volumes
* from -63.5dB (mute) to 0dB step 0.5dB * from -63.5dB (mute) to 0dB step 0.5dB
* *
* Used for AK4524 input/ouput attenuation, AK4528, and * Used for AK4524/AK4620 input/ouput attenuation, AK4528, and
* AK5365 input attenuation * AK5365 input attenuation
*/ */
static const unsigned char vol_cvt_datt[128] = { static const unsigned char vol_cvt_datt[128] = {
...@@ -259,8 +255,22 @@ void snd_akm4xxx_init(struct snd_akm4xxx *ak) ...@@ -259,8 +255,22 @@ void snd_akm4xxx_init(struct snd_akm4xxx *ak)
0x00, 0x0f, /* 0: power-up, un-reset */ 0x00, 0x0f, /* 0: power-up, un-reset */
0xff, 0xff 0xff, 0xff
}; };
static const unsigned char inits_ak4620[] = {
0x00, 0x07, /* 0: normal */
0x01, 0x00, /* 0: reset */
0x01, 0x02, /* 1: RSTAD */
0x01, 0x03, /* 1: RSTDA */
0x01, 0x0f, /* 1: normal */
0x02, 0x60, /* 2: 24bit I2S */
0x03, 0x01, /* 3: deemphasis off */
0x04, 0x00, /* 4: LIN muted */
0x05, 0x00, /* 5: RIN muted */
0x06, 0x00, /* 6: LOUT muted */
0x07, 0x00, /* 7: ROUT muted */
0xff, 0xff
};
int chip, num_chips; int chip;
const unsigned char *ptr, *inits; const unsigned char *ptr, *inits;
unsigned char reg, data; unsigned char reg, data;
...@@ -270,42 +280,64 @@ void snd_akm4xxx_init(struct snd_akm4xxx *ak) ...@@ -270,42 +280,64 @@ void snd_akm4xxx_init(struct snd_akm4xxx *ak)
switch (ak->type) { switch (ak->type) {
case SND_AK4524: case SND_AK4524:
inits = inits_ak4524; inits = inits_ak4524;
num_chips = ak->num_dacs / 2; ak->num_chips = ak->num_dacs / 2;
ak->name = "ak4524";
ak->total_regs = 0x08;
break; break;
case SND_AK4528: case SND_AK4528:
inits = inits_ak4528; inits = inits_ak4528;
num_chips = ak->num_dacs / 2; ak->num_chips = ak->num_dacs / 2;
ak->name = "ak4528";
ak->total_regs = 0x06;
break; break;
case SND_AK4529: case SND_AK4529:
inits = inits_ak4529; inits = inits_ak4529;
num_chips = 1; ak->num_chips = 1;
ak->name = "ak4529";
ak->total_regs = 0x0d;
break; break;
case SND_AK4355: case SND_AK4355:
inits = inits_ak4355; inits = inits_ak4355;
num_chips = 1; ak->num_chips = 1;
ak->name = "ak4355";
ak->total_regs = 0x0b;
break; break;
case SND_AK4358: case SND_AK4358:
inits = inits_ak4358; inits = inits_ak4358;
num_chips = 1; ak->num_chips = 1;
ak->name = "ak4358";
ak->total_regs = 0x10;
break; break;
case SND_AK4381: case SND_AK4381:
inits = inits_ak4381; inits = inits_ak4381;
num_chips = ak->num_dacs / 2; ak->num_chips = ak->num_dacs / 2;
ak->name = "ak4381";
ak->total_regs = 0x05;
break; break;
case SND_AK5365: case SND_AK5365:
/* FIXME: any init sequence? */ /* FIXME: any init sequence? */
ak->num_chips = 1;
ak->name = "ak5365";
ak->total_regs = 0x08;
return; return;
case SND_AK4620:
inits = inits_ak4620;
ak->num_chips = ak->num_dacs / 2;
ak->name = "ak4620";
ak->total_regs = 0x08;
break;
default: default:
snd_BUG(); snd_BUG();
return; return;
} }
for (chip = 0; chip < num_chips; chip++) { for (chip = 0; chip < ak->num_chips; chip++) {
ptr = inits; ptr = inits;
while (*ptr != 0xff) { while (*ptr != 0xff) {
reg = *ptr++; reg = *ptr++;
data = *ptr++; data = *ptr++;
snd_akm4xxx_write(ak, chip, reg, data); snd_akm4xxx_write(ak, chip, reg, data);
udelay(10);
} }
} }
} }
...@@ -688,6 +720,12 @@ static int build_dac_controls(struct snd_akm4xxx *ak) ...@@ -688,6 +720,12 @@ static int build_dac_controls(struct snd_akm4xxx *ak)
AK_COMPOSE(idx/2, (idx%2) + 3, 0, 255); AK_COMPOSE(idx/2, (idx%2) + 3, 0, 255);
knew.tlv.p = db_scale_linear; knew.tlv.p = db_scale_linear;
break; break;
case SND_AK4620:
/* register 6 & 7 */
knew.private_value =
AK_COMPOSE(idx/2, (idx%2) + 6, 0, 255);
knew.tlv.p = db_scale_linear;
break;
default: default:
return -EINVAL; return -EINVAL;
} }
...@@ -704,10 +742,12 @@ static int build_dac_controls(struct snd_akm4xxx *ak) ...@@ -704,10 +742,12 @@ static int build_dac_controls(struct snd_akm4xxx *ak)
static int build_adc_controls(struct snd_akm4xxx *ak) static int build_adc_controls(struct snd_akm4xxx *ak)
{ {
int idx, err, mixer_ch, num_stereo; int idx, err, mixer_ch, num_stereo, max_steps;
struct snd_kcontrol_new knew; struct snd_kcontrol_new knew;
mixer_ch = 0; mixer_ch = 0;
if (ak->type == SND_AK4528)
return 0; /* no controls */
for (idx = 0; idx < ak->num_adcs;) { for (idx = 0; idx < ak->num_adcs;) {
memset(&knew, 0, sizeof(knew)); memset(&knew, 0, sizeof(knew));
if (! ak->adc_info || ! ak->adc_info[mixer_ch].name) { if (! ak->adc_info || ! ak->adc_info[mixer_ch].name) {
...@@ -733,12 +773,11 @@ static int build_adc_controls(struct snd_akm4xxx *ak) ...@@ -733,12 +773,11 @@ static int build_adc_controls(struct snd_akm4xxx *ak)
} }
/* register 4 & 5 */ /* register 4 & 5 */
if (ak->type == SND_AK5365) if (ak->type == SND_AK5365)
knew.private_value = max_steps = 152;
AK_COMPOSE(idx/2, (idx%2) + 4, 0, 151) |
AK_VOL_CVT | AK_IPGA;
else else
max_steps = 164;
knew.private_value = knew.private_value =
AK_COMPOSE(idx/2, (idx%2) + 4, 0, 163) | AK_COMPOSE(idx/2, (idx%2) + 4, 0, max_steps) |
AK_VOL_CVT | AK_IPGA; AK_VOL_CVT | AK_IPGA;
knew.tlv.p = db_scale_vol_datt; knew.tlv.p = db_scale_vol_datt;
err = snd_ctl_add(ak->card, snd_ctl_new1(&knew, ak)); err = snd_ctl_add(ak->card, snd_ctl_new1(&knew, ak));
...@@ -808,6 +847,7 @@ static int build_deemphasis(struct snd_akm4xxx *ak, int num_emphs) ...@@ -808,6 +847,7 @@ static int build_deemphasis(struct snd_akm4xxx *ak, int num_emphs)
switch (ak->type) { switch (ak->type) {
case SND_AK4524: case SND_AK4524:
case SND_AK4528: case SND_AK4528:
case SND_AK4620:
/* register 3 */ /* register 3 */
knew.private_value = AK_COMPOSE(idx, 3, 0, 0); knew.private_value = AK_COMPOSE(idx, 3, 0, 0);
break; break;
...@@ -834,6 +874,35 @@ static int build_deemphasis(struct snd_akm4xxx *ak, int num_emphs) ...@@ -834,6 +874,35 @@ static int build_deemphasis(struct snd_akm4xxx *ak, int num_emphs)
return 0; return 0;
} }
#ifdef CONFIG_PROC_FS
static void proc_regs_read(struct snd_info_entry *entry,
struct snd_info_buffer *buffer)
{
struct snd_akm4xxx *ak = (struct snd_akm4xxx *)entry->private_data;
int reg, val, chip;
for (chip = 0; chip < ak->num_chips; chip++) {
for (reg = 0; reg < ak->total_regs; reg++) {
val = snd_akm4xxx_get(ak, chip, reg);
snd_iprintf(buffer, "chip %d: 0x%02x = 0x%02x\n", chip,
reg, val);
}
}
}
static int proc_init(struct snd_akm4xxx *ak)
{
struct snd_info_entry *entry;
int err;
err = snd_card_proc_new(ak->card, ak->name, &entry);
if (err < 0)
return err;
snd_info_set_text_ops(entry, ak, proc_regs_read);
return 0;
}
#else /* !CONFIG_PROC_FS */
static int proc_init(struct snd_akm4xxx *ak) {}
#endif
int snd_akm4xxx_build_controls(struct snd_akm4xxx *ak) int snd_akm4xxx_build_controls(struct snd_akm4xxx *ak)
{ {
int err, num_emphs; int err, num_emphs;
...@@ -845,18 +914,21 @@ int snd_akm4xxx_build_controls(struct snd_akm4xxx *ak) ...@@ -845,18 +914,21 @@ int snd_akm4xxx_build_controls(struct snd_akm4xxx *ak)
err = build_adc_controls(ak); err = build_adc_controls(ak);
if (err < 0) if (err < 0)
return err; return err;
if (ak->type == SND_AK4355 || ak->type == SND_AK4358) if (ak->type == SND_AK4355 || ak->type == SND_AK4358)
num_emphs = 1; num_emphs = 1;
else if (ak->type == SND_AK4620)
num_emphs = 0;
else else
num_emphs = ak->num_dacs / 2; num_emphs = ak->num_dacs / 2;
err = build_deemphasis(ak, num_emphs); err = build_deemphasis(ak, num_emphs);
if (err < 0)
return err;
err = proc_init(ak);
if (err < 0) if (err < 0)
return err; return err;
return 0; return 0;
} }
EXPORT_SYMBOL(snd_akm4xxx_build_controls); EXPORT_SYMBOL(snd_akm4xxx_build_controls);
static int __init alsa_akm4xxx_module_init(void) static int __init alsa_akm4xxx_module_init(void)
......
sound/pci/ice1712/Makefile
View file @ 980f31c4
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
snd-ice17xx-ak4xxx-objs := ak4xxx.o snd-ice17xx-ak4xxx-objs := ak4xxx.o
snd-ice1712-objs := ice1712.o delta.o hoontech.o ews.o snd-ice1712-objs := ice1712.o delta.o hoontech.o ews.o
snd-ice1724-objs := ice1724.o amp.o revo.o aureon.o vt1720_mobo.o pontis.o prodigy192.o prodigy_hifi.o juli.o phase.o wtm.o se.o maya44.o snd-ice1724-objs := ice1724.o amp.o revo.o aureon.o vt1720_mobo.o pontis.o prodigy192.o prodigy_hifi.o juli.o phase.o wtm.o se.o maya44.o quartet.o
# Toplevel Module Dependency # Toplevel Module Dependency
obj-$(CONFIG_SND_ICE1712) += snd-ice1712.o snd-ice17xx-ak4xxx.o obj-$(CONFIG_SND_ICE1712) += snd-ice1712.o snd-ice17xx-ak4xxx.o
......
sound/pci/ice1712/ice1712.c
View file @ 980f31c4
...@@ -298,6 +298,16 @@ static void snd_ice1712_set_gpio_dir(struct snd_ice1712 *ice, unsigned int data) ...@@ -298,6 +298,16 @@ static void snd_ice1712_set_gpio_dir(struct snd_ice1712 *ice, unsigned int data)
inb(ICEREG(ice, DATA)); /* dummy read for pci-posting */ inb(ICEREG(ice, DATA)); /* dummy read for pci-posting */
} }
static unsigned int snd_ice1712_get_gpio_dir(struct snd_ice1712 *ice)
{
return snd_ice1712_read(ice, ICE1712_IREG_GPIO_DIRECTION);
}
static unsigned int snd_ice1712_get_gpio_mask(struct snd_ice1712 *ice)
{
return snd_ice1712_read(ice, ICE1712_IREG_GPIO_WRITE_MASK);
}
static void snd_ice1712_set_gpio_mask(struct snd_ice1712 *ice, unsigned int data) static void snd_ice1712_set_gpio_mask(struct snd_ice1712 *ice, unsigned int data)
{ {
snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK, data); snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK, data);
...@@ -2557,7 +2567,9 @@ static int __devinit snd_ice1712_create(struct snd_card *card, ...@@ -2557,7 +2567,9 @@ static int __devinit snd_ice1712_create(struct snd_card *card,
mutex_init(&ice->i2c_mutex); mutex_init(&ice->i2c_mutex);
mutex_init(&ice->open_mutex); mutex_init(&ice->open_mutex);
ice->gpio.set_mask = snd_ice1712_set_gpio_mask; ice->gpio.set_mask = snd_ice1712_set_gpio_mask;
ice->gpio.get_mask = snd_ice1712_get_gpio_mask;
ice->gpio.set_dir = snd_ice1712_set_gpio_dir; ice->gpio.set_dir = snd_ice1712_set_gpio_dir;
ice->gpio.get_dir = snd_ice1712_get_gpio_dir;
ice->gpio.set_data = snd_ice1712_set_gpio_data; ice->gpio.set_data = snd_ice1712_set_gpio_data;
ice->gpio.get_data = snd_ice1712_get_gpio_data; ice->gpio.get_data = snd_ice1712_get_gpio_data;
......
sound/pci/ice1712/ice1712.h
View file @ 980f31c4
...@@ -359,7 +359,9 @@ struct snd_ice1712 { ...@@ -359,7 +359,9 @@ struct snd_ice1712 {
unsigned int saved[2]; /* for ewx_i2c */ unsigned int saved[2]; /* for ewx_i2c */
/* operators */ /* operators */
void (*set_mask)(struct snd_ice1712 *ice, unsigned int data); void (*set_mask)(struct snd_ice1712 *ice, unsigned int data);
unsigned int (*get_mask)(struct snd_ice1712 *ice);
void (*set_dir)(struct snd_ice1712 *ice, unsigned int data); void (*set_dir)(struct snd_ice1712 *ice, unsigned int data);
unsigned int (*get_dir)(struct snd_ice1712 *ice);
void (*set_data)(struct snd_ice1712 *ice, unsigned int data); void (*set_data)(struct snd_ice1712 *ice, unsigned int data);
unsigned int (*get_data)(struct snd_ice1712 *ice); unsigned int (*get_data)(struct snd_ice1712 *ice);
/* misc operators - move to another place? */ /* misc operators - move to another place? */
...@@ -377,8 +379,11 @@ struct snd_ice1712 { ...@@ -377,8 +379,11 @@ struct snd_ice1712 {
unsigned int (*get_rate)(struct snd_ice1712 *ice); unsigned int (*get_rate)(struct snd_ice1712 *ice);
void (*set_rate)(struct snd_ice1712 *ice, unsigned int rate); void (*set_rate)(struct snd_ice1712 *ice, unsigned int rate);
unsigned char (*set_mclk)(struct snd_ice1712 *ice, unsigned int rate); unsigned char (*set_mclk)(struct snd_ice1712 *ice, unsigned int rate);
void (*set_spdif_clock)(struct snd_ice1712 *ice); int (*set_spdif_clock)(struct snd_ice1712 *ice, int type);
int (*get_spdif_master_type)(struct snd_ice1712 *ice);
char **ext_clock_names;
int ext_clock_count;
void (*pro_open)(struct snd_ice1712 *, struct snd_pcm_substream *);
#ifdef CONFIG_PM #ifdef CONFIG_PM
int (*pm_suspend)(struct snd_ice1712 *); int (*pm_suspend)(struct snd_ice1712 *);
int (*pm_resume)(struct snd_ice1712 *); int (*pm_resume)(struct snd_ice1712 *);
...@@ -399,6 +404,11 @@ static inline void snd_ice1712_gpio_set_dir(struct snd_ice1712 *ice, unsigned in ...@@ -399,6 +404,11 @@ static inline void snd_ice1712_gpio_set_dir(struct snd_ice1712 *ice, unsigned in
ice->gpio.set_dir(ice, bits); ice->gpio.set_dir(ice, bits);
} }
static inline unsigned int snd_ice1712_gpio_get_dir(struct snd_ice1712 *ice)
{
return ice->gpio.get_dir(ice);
}
static inline void snd_ice1712_gpio_set_mask(struct snd_ice1712 *ice, unsigned int bits) static inline void snd_ice1712_gpio_set_mask(struct snd_ice1712 *ice, unsigned int bits)
{ {
ice->gpio.set_mask(ice, bits); ice->gpio.set_mask(ice, bits);
......
sound/pci/ice1712/ice1724.c
View file @ 980f31c4
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
#include "phase.h" #include "phase.h"
#include "wtm.h" #include "wtm.h"
#include "se.h" #include "se.h"
#include "quartet.h"
MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>"); MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
MODULE_DESCRIPTION("VIA ICEnsemble ICE1724/1720 (Envy24HT/PT)"); MODULE_DESCRIPTION("VIA ICEnsemble ICE1724/1720 (Envy24HT/PT)");
...@@ -70,6 +71,7 @@ MODULE_SUPPORTED_DEVICE("{" ...@@ -70,6 +71,7 @@ MODULE_SUPPORTED_DEVICE("{"
PHASE_DEVICE_DESC PHASE_DEVICE_DESC
WTM_DEVICE_DESC WTM_DEVICE_DESC
SE_DEVICE_DESC SE_DEVICE_DESC
QTET_DEVICE_DESC
"{VIA,VT1720}," "{VIA,VT1720},"
"{VIA,VT1724}," "{VIA,VT1724},"
"{ICEnsemble,Generic ICE1724}," "{ICEnsemble,Generic ICE1724},"
...@@ -104,6 +106,8 @@ static int PRO_RATE_LOCKED; ...@@ -104,6 +106,8 @@ static int PRO_RATE_LOCKED;
static int PRO_RATE_RESET = 1; static int PRO_RATE_RESET = 1;
static unsigned int PRO_RATE_DEFAULT = 44100; static unsigned int PRO_RATE_DEFAULT = 44100;
static char *ext_clock_names[1] = { "IEC958 In" };
/* /*
* Basic I/O * Basic I/O
*/ */
...@@ -118,9 +122,12 @@ static inline int stdclock_is_spdif_master(struct snd_ice1712 *ice) ...@@ -118,9 +122,12 @@ static inline int stdclock_is_spdif_master(struct snd_ice1712 *ice)
return (inb(ICEMT1724(ice, RATE)) & VT1724_SPDIF_MASTER) ? 1 : 0; return (inb(ICEMT1724(ice, RATE)) & VT1724_SPDIF_MASTER) ? 1 : 0;
} }
/*
* locking rate makes sense only for internal clock mode
*/
static inline int is_pro_rate_locked(struct snd_ice1712 *ice) static inline int is_pro_rate_locked(struct snd_ice1712 *ice)
{ {
return ice->is_spdif_master(ice) || PRO_RATE_LOCKED; return (!ice->is_spdif_master(ice)) && PRO_RATE_LOCKED;
} }
/* /*
...@@ -196,6 +203,12 @@ static void snd_vt1724_set_gpio_dir(struct snd_ice1712 *ice, unsigned int data) ...@@ -196,6 +203,12 @@ static void snd_vt1724_set_gpio_dir(struct snd_ice1712 *ice, unsigned int data)
inw(ICEREG1724(ice, GPIO_DIRECTION)); /* dummy read for pci-posting */ inw(ICEREG1724(ice, GPIO_DIRECTION)); /* dummy read for pci-posting */
} }
/* get gpio direction 0 = read, 1 = write */
static unsigned int snd_vt1724_get_gpio_dir(struct snd_ice1712 *ice)
{
return inl(ICEREG1724(ice, GPIO_DIRECTION));
}
/* set the gpio mask (0 = writable) */ /* set the gpio mask (0 = writable) */
static void snd_vt1724_set_gpio_mask(struct snd_ice1712 *ice, unsigned int data) static void snd_vt1724_set_gpio_mask(struct snd_ice1712 *ice, unsigned int data)
{ {
...@@ -205,6 +218,17 @@ static void snd_vt1724_set_gpio_mask(struct snd_ice1712 *ice, unsigned int data) ...@@ -205,6 +218,17 @@ static void snd_vt1724_set_gpio_mask(struct snd_ice1712 *ice, unsigned int data)
inw(ICEREG1724(ice, GPIO_WRITE_MASK)); /* dummy read for pci-posting */ inw(ICEREG1724(ice, GPIO_WRITE_MASK)); /* dummy read for pci-posting */
} }
static unsigned int snd_vt1724_get_gpio_mask(struct snd_ice1712 *ice)
{
unsigned int mask;
if (!ice->vt1720)
mask = (unsigned int)inb(ICEREG1724(ice, GPIO_WRITE_MASK_22));
else
mask = 0;
mask = (mask << 16) | inw(ICEREG1724(ice, GPIO_WRITE_MASK));
return mask;
}
static void snd_vt1724_set_gpio_data(struct snd_ice1712 *ice, unsigned int data) static void snd_vt1724_set_gpio_data(struct snd_ice1712 *ice, unsigned int data)
{ {
outw(data, ICEREG1724(ice, GPIO_DATA)); outw(data, ICEREG1724(ice, GPIO_DATA));
...@@ -651,10 +675,15 @@ static int snd_vt1724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate, ...@@ -651,10 +675,15 @@ static int snd_vt1724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate,
return ((rate == ice->cur_rate) && !force) ? 0 : -EBUSY; return ((rate == ice->cur_rate) && !force) ? 0 : -EBUSY;
} }
if (!force && is_pro_rate_locked(ice)) { if (!force && is_pro_rate_locked(ice)) {
/* comparing required and current rate - makes sense for
* internal clock only */
spin_unlock_irqrestore(&ice->reg_lock, flags); spin_unlock_irqrestore(&ice->reg_lock, flags);
return (rate == ice->cur_rate) ? 0 : -EBUSY; return (rate == ice->cur_rate) ? 0 : -EBUSY;
} }
if (force || !ice->is_spdif_master(ice)) {
/* force means the rate was switched by ucontrol, otherwise
* setting clock rate for internal clock mode */
old_rate = ice->get_rate(ice); old_rate = ice->get_rate(ice);
if (force || (old_rate != rate)) if (force || (old_rate != rate))
ice->set_rate(ice, rate); ice->set_rate(ice, rate);
...@@ -662,6 +691,7 @@ static int snd_vt1724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate, ...@@ -662,6 +691,7 @@ static int snd_vt1724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate,
spin_unlock_irqrestore(&ice->reg_lock, flags); spin_unlock_irqrestore(&ice->reg_lock, flags);
return 0; return 0;
} }
}
ice->cur_rate = rate; ice->cur_rate = rate;
...@@ -1016,6 +1046,8 @@ static int snd_vt1724_playback_pro_open(struct snd_pcm_substream *substream) ...@@ -1016,6 +1046,8 @@ static int snd_vt1724_playback_pro_open(struct snd_pcm_substream *substream)
VT1724_BUFFER_ALIGN); VT1724_BUFFER_ALIGN);
snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
VT1724_BUFFER_ALIGN); VT1724_BUFFER_ALIGN);
if (ice->pro_open)
ice->pro_open(ice, substream);
return 0; return 0;
} }
...@@ -1034,6 +1066,8 @@ static int snd_vt1724_capture_pro_open(struct snd_pcm_substream *substream) ...@@ -1034,6 +1066,8 @@ static int snd_vt1724_capture_pro_open(struct snd_pcm_substream *substream)
VT1724_BUFFER_ALIGN); VT1724_BUFFER_ALIGN);
snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
VT1724_BUFFER_ALIGN); VT1724_BUFFER_ALIGN);
if (ice->pro_open)
ice->pro_open(ice, substream);
return 0; return 0;
} }
...@@ -1787,15 +1821,21 @@ static int snd_vt1724_pro_internal_clock_info(struct snd_kcontrol *kcontrol, ...@@ -1787,15 +1821,21 @@ static int snd_vt1724_pro_internal_clock_info(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo) struct snd_ctl_elem_info *uinfo)
{ {
struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
int hw_rates_count = ice->hw_rates->count;
uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
uinfo->count = 1; uinfo->count = 1;
uinfo->value.enumerated.items = ice->hw_rates->count + 1;
uinfo->value.enumerated.items = hw_rates_count + ice->ext_clock_count;
/* upper limit - keep at top */
if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items) if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1; uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
if (uinfo->value.enumerated.item == uinfo->value.enumerated.items - 1) if (uinfo->value.enumerated.item >= hw_rates_count)
strcpy(uinfo->value.enumerated.name, "IEC958 Input"); /* ext_clock items */
strcpy(uinfo->value.enumerated.name,
ice->ext_clock_names[
uinfo->value.enumerated.item - hw_rates_count]);
else else
/* int clock items */
sprintf(uinfo->value.enumerated.name, "%d", sprintf(uinfo->value.enumerated.name, "%d",
ice->hw_rates->list[uinfo->value.enumerated.item]); ice->hw_rates->list[uinfo->value.enumerated.item]);
return 0; return 0;
...@@ -1809,7 +1849,8 @@ static int snd_vt1724_pro_internal_clock_get(struct snd_kcontrol *kcontrol, ...@@ -1809,7 +1849,8 @@ static int snd_vt1724_pro_internal_clock_get(struct snd_kcontrol *kcontrol,
spin_lock_irq(&ice->reg_lock); spin_lock_irq(&ice->reg_lock);
if (ice->is_spdif_master(ice)) { if (ice->is_spdif_master(ice)) {
ucontrol->value.enumerated.item[0] = ice->hw_rates->count; ucontrol->value.enumerated.item[0] = ice->hw_rates->count +
ice->get_spdif_master_type(ice);
} else { } else {
rate = ice->get_rate(ice); rate = ice->get_rate(ice);
ucontrol->value.enumerated.item[0] = 0; ucontrol->value.enumerated.item[0] = 0;
...@@ -1824,8 +1865,14 @@ static int snd_vt1724_pro_internal_clock_get(struct snd_kcontrol *kcontrol, ...@@ -1824,8 +1865,14 @@ static int snd_vt1724_pro_internal_clock_get(struct snd_kcontrol *kcontrol,
return 0; return 0;
} }
static int stdclock_get_spdif_master_type(struct snd_ice1712 *ice)
{
/* standard external clock - only single type - SPDIF IN */
return 0;
}
/* setting clock to external - SPDIF */ /* setting clock to external - SPDIF */
static void stdclock_set_spdif_clock(struct snd_ice1712 *ice) static int stdclock_set_spdif_clock(struct snd_ice1712 *ice, int type)
{ {
unsigned char oval; unsigned char oval;
unsigned char i2s_oval; unsigned char i2s_oval;
...@@ -1834,27 +1881,30 @@ static void stdclock_set_spdif_clock(struct snd_ice1712 *ice) ...@@ -1834,27 +1881,30 @@ static void stdclock_set_spdif_clock(struct snd_ice1712 *ice)
/* setting 256fs */ /* setting 256fs */
i2s_oval = inb(ICEMT1724(ice, I2S_FORMAT)); i2s_oval = inb(ICEMT1724(ice, I2S_FORMAT));
outb(i2s_oval & ~VT1724_MT_I2S_MCLK_128X, ICEMT1724(ice, I2S_FORMAT)); outb(i2s_oval & ~VT1724_MT_I2S_MCLK_128X, ICEMT1724(ice, I2S_FORMAT));
return 0;
} }
static int snd_vt1724_pro_internal_clock_put(struct snd_kcontrol *kcontrol, static int snd_vt1724_pro_internal_clock_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
unsigned int old_rate, new_rate; unsigned int old_rate, new_rate;
unsigned int item = ucontrol->value.enumerated.item[0]; unsigned int item = ucontrol->value.enumerated.item[0];
unsigned int spdif = ice->hw_rates->count; unsigned int first_ext_clock = ice->hw_rates->count;
if (item > spdif) if (item > first_ext_clock + ice->ext_clock_count - 1)
return -EINVAL; return -EINVAL;
/* if rate = 0 => external clock */
spin_lock_irq(&ice->reg_lock); spin_lock_irq(&ice->reg_lock);
if (ice->is_spdif_master(ice)) if (ice->is_spdif_master(ice))
old_rate = 0; old_rate = 0;
else else
old_rate = ice->get_rate(ice); old_rate = ice->get_rate(ice);
if (item == spdif) { if (item >= first_ext_clock) {
/* switching to external clock via SPDIF */ /* switching to external clock */
ice->set_spdif_clock(ice); ice->set_spdif_clock(ice, item - first_ext_clock);
new_rate = 0; new_rate = 0;
} else { } else {
/* internal on-card clock */ /* internal on-card clock */
...@@ -1866,7 +1916,7 @@ static int snd_vt1724_pro_internal_clock_put(struct snd_kcontrol *kcontrol, ...@@ -1866,7 +1916,7 @@ static int snd_vt1724_pro_internal_clock_put(struct snd_kcontrol *kcontrol,
} }
spin_unlock_irq(&ice->reg_lock); spin_unlock_irq(&ice->reg_lock);
/* the first reset to the SPDIF master mode? */ /* the first switch to the ext. clock mode? */
if (old_rate != new_rate && !new_rate) { if (old_rate != new_rate && !new_rate) {
/* notify akm chips as well */ /* notify akm chips as well */
unsigned int i; unsigned int i;
...@@ -2136,6 +2186,7 @@ static struct snd_ice1712_card_info *card_tables[] __devinitdata = { ...@@ -2136,6 +2186,7 @@ static struct snd_ice1712_card_info *card_tables[] __devinitdata = {
snd_vt1724_phase_cards, snd_vt1724_phase_cards,
snd_vt1724_wtm_cards, snd_vt1724_wtm_cards,
snd_vt1724_se_cards, snd_vt1724_se_cards,
snd_vt1724_qtet_cards,
NULL, NULL,
}; };
...@@ -2434,7 +2485,9 @@ static int __devinit snd_vt1724_create(struct snd_card *card, ...@@ -2434,7 +2485,9 @@ static int __devinit snd_vt1724_create(struct snd_card *card,
mutex_init(&ice->open_mutex); mutex_init(&ice->open_mutex);
mutex_init(&ice->i2c_mutex); mutex_init(&ice->i2c_mutex);
ice->gpio.set_mask = snd_vt1724_set_gpio_mask; ice->gpio.set_mask = snd_vt1724_set_gpio_mask;
ice->gpio.get_mask = snd_vt1724_get_gpio_mask;
ice->gpio.set_dir = snd_vt1724_set_gpio_dir; ice->gpio.set_dir = snd_vt1724_set_gpio_dir;
ice->gpio.get_dir = snd_vt1724_get_gpio_dir;
ice->gpio.set_data = snd_vt1724_set_gpio_data; ice->gpio.set_data = snd_vt1724_set_gpio_data;
ice->gpio.get_data = snd_vt1724_get_gpio_data; ice->gpio.get_data = snd_vt1724_get_gpio_data;
ice->card = card; ice->card = card;
...@@ -2522,6 +2575,9 @@ static int __devinit snd_vt1724_probe(struct pci_dev *pci, ...@@ -2522,6 +2575,9 @@ static int __devinit snd_vt1724_probe(struct pci_dev *pci,
return err; return err;
} }
/* field init before calling chip_init */
ice->ext_clock_count = 0;
for (tbl = card_tables; *tbl; tbl++) { for (tbl = card_tables; *tbl; tbl++) {
for (c = *tbl; c->subvendor; c++) { for (c = *tbl; c->subvendor; c++) {
if (c->subvendor == ice->eeprom.subvendor) { if (c->subvendor == ice->eeprom.subvendor) {
...@@ -2560,6 +2616,13 @@ __found: ...@@ -2560,6 +2616,13 @@ __found:
ice->set_mclk = stdclock_set_mclk; ice->set_mclk = stdclock_set_mclk;
if (!ice->set_spdif_clock) if (!ice->set_spdif_clock)
ice->set_spdif_clock = stdclock_set_spdif_clock; ice->set_spdif_clock = stdclock_set_spdif_clock;
if (!ice->get_spdif_master_type)
ice->get_spdif_master_type = stdclock_get_spdif_master_type;
if (!ice->ext_clock_names)
ice->ext_clock_names = ext_clock_names;
if (!ice->ext_clock_count)
ice->ext_clock_count = ARRAY_SIZE(ext_clock_names);
if (!ice->hw_rates) if (!ice->hw_rates)
set_std_hw_rates(ice); set_std_hw_rates(ice);
...@@ -2719,7 +2782,7 @@ static int snd_vt1724_resume(struct pci_dev *pci) ...@@ -2719,7 +2782,7 @@ static int snd_vt1724_resume(struct pci_dev *pci)
if (ice->pm_saved_is_spdif_master) { if (ice->pm_saved_is_spdif_master) {
/* switching to external clock via SPDIF */ /* switching to external clock via SPDIF */
ice->set_spdif_clock(ice); ice->set_spdif_clock(ice, 0);
} else { } else {
/* internal on-card clock */ /* internal on-card clock */
snd_vt1724_set_pro_rate(ice, ice->pro_rate_default, 1); snd_vt1724_set_pro_rate(ice, ice->pro_rate_default, 1);
......
sound/pci/ice1712/juli.c
View file @ 980f31c4
...@@ -412,25 +412,6 @@ static struct snd_kcontrol_new juli_mute_controls[] __devinitdata = { ...@@ -412,25 +412,6 @@ static struct snd_kcontrol_new juli_mute_controls[] __devinitdata = {
}, },
}; };
static void ak4358_proc_regs_read(struct snd_info_entry *entry,
struct snd_info_buffer *buffer)
{
struct snd_ice1712 *ice = (struct snd_ice1712 *)entry->private_data;
int reg, val;
for (reg = 0; reg <= 0xf; reg++) {
val = snd_akm4xxx_get(ice->akm, 0, reg);
snd_iprintf(buffer, "0x%02x = 0x%02x\n", reg, val);
}
}
static void ak4358_proc_init(struct snd_ice1712 *ice)
{
struct snd_info_entry *entry;
if (!snd_card_proc_new(ice->card, "ak4358_codec", &entry))
snd_info_set_text_ops(entry, ice, ak4358_proc_regs_read);
}
static char *slave_vols[] __devinitdata = { static char *slave_vols[] __devinitdata = {
PCM_VOLUME, PCM_VOLUME,
MONITOR_AN_IN_VOLUME, MONITOR_AN_IN_VOLUME,
...@@ -496,8 +477,6 @@ static int __devinit juli_add_controls(struct snd_ice1712 *ice) ...@@ -496,8 +477,6 @@ static int __devinit juli_add_controls(struct snd_ice1712 *ice)
/* only capture SPDIF over AK4114 */ /* only capture SPDIF over AK4114 */
err = snd_ak4114_build(spec->ak4114, NULL, err = snd_ak4114_build(spec->ak4114, NULL,
ice->pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream); ice->pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream);
ak4358_proc_init(ice);
if (err < 0) if (err < 0)
return err; return err;
return 0; return 0;
...@@ -550,13 +529,14 @@ static inline unsigned char juli_set_mclk(struct snd_ice1712 *ice, ...@@ -550,13 +529,14 @@ static inline unsigned char juli_set_mclk(struct snd_ice1712 *ice,
} }
/* setting clock to external - SPDIF */ /* setting clock to external - SPDIF */
static void juli_set_spdif_clock(struct snd_ice1712 *ice) static int juli_set_spdif_clock(struct snd_ice1712 *ice, int type)
{ {
unsigned int old; unsigned int old;
old = ice->gpio.get_data(ice); old = ice->gpio.get_data(ice);
/* external clock (= 0), multiply 1x, 48kHz */ /* external clock (= 0), multiply 1x, 48kHz */
ice->gpio.set_data(ice, (old & ~GPIO_RATE_MASK) | GPIO_MULTI_1X | ice->gpio.set_data(ice, (old & ~GPIO_RATE_MASK) | GPIO_MULTI_1X |
GPIO_FREQ_48KHZ); GPIO_FREQ_48KHZ);
return 0;
} }
/* Called when ak4114 detects change in the input SPDIF stream */ /* Called when ak4114 detects change in the input SPDIF stream */
......
sound/pci/ice1712/quartet.c 0 → 100644
View file @ 980f31c4
This diff is collapsed.
sound/pci/ice1712/quartet.h 0 → 100644
View file @ 980f31c4
#ifndef __SOUND_QTET_H
#define __SOUND_QTET_H
#define QTET_DEVICE_DESC "{Infrasonic,Quartet},"
#define VT1724_SUBDEVICE_QTET 0x30305349 /* Infrasonic Quartet */
extern struct snd_ice1712_card_info snd_vt1724_qtet_cards[];
#endif /* __SOUND_QTET_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment