Merge branch 'topic/virtuoso' into for-linus
This commit is contained in:
commit
6e78b780ef
2 changed files with 4 additions and 3 deletions
|
@ -744,8 +744,8 @@ config SND_VIRTUOSO
|
||||||
select SND_OXYGEN_LIB
|
select SND_OXYGEN_LIB
|
||||||
help
|
help
|
||||||
Say Y here to include support for sound cards based on the
|
Say Y here to include support for sound cards based on the
|
||||||
Asus AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X and
|
Asus AV100/AV200 chips, i.e., Xonar D1, DX, D2 and D2X.
|
||||||
HDAV1.3 (Deluxe).
|
Support for the HDAV1.3 (Deluxe) is very experimental.
|
||||||
|
|
||||||
To compile this driver as a module, choose M here: the module
|
To compile this driver as a module, choose M here: the module
|
||||||
will be called snd-virtuoso.
|
will be called snd-virtuoso.
|
||||||
|
|
|
@ -683,7 +683,7 @@ static void xonar_hdav_uart_input(struct oxygen *chip)
|
||||||
if (chip->uart_input_count >= 2 &&
|
if (chip->uart_input_count >= 2 &&
|
||||||
chip->uart_input[chip->uart_input_count - 2] == 'O' &&
|
chip->uart_input[chip->uart_input_count - 2] == 'O' &&
|
||||||
chip->uart_input[chip->uart_input_count - 1] == 'K') {
|
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,
|
print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
|
||||||
chip->uart_input, chip->uart_input_count);
|
chip->uart_input, chip->uart_input_count);
|
||||||
chip->uart_input_count = 0;
|
chip->uart_input_count = 0;
|
||||||
|
@ -908,6 +908,7 @@ static const struct oxygen_model model_xonar_hdav = {
|
||||||
.dac_channels = 8,
|
.dac_channels = 8,
|
||||||
.dac_volume_min = 0x0f,
|
.dac_volume_min = 0x0f,
|
||||||
.dac_volume_max = 0xff,
|
.dac_volume_max = 0xff,
|
||||||
|
.misc_flags = OXYGEN_MISC_MIDI,
|
||||||
.function_flags = OXYGEN_FUNCTION_2WIRE,
|
.function_flags = OXYGEN_FUNCTION_2WIRE,
|
||||||
.dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
|
.dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
|
||||||
.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
|
.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
|
||||||
|
|
Reference in a new issue