Commit c81c6b35 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai

ALSA: virtuoso: fix silent analog output on Xonar Essence ST Deluxe

Commit dd203fa9 (ALSA: virtuoso: remove non-working controls on
Essence ST Deluxe) made it impossible to adjust the volume after the
driver initialized it to muted.

Ensure that those DACs that can be accessed with I2C are initialized
to the same volume that is the reset default of the DAC without I2C.
Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Cc: 2.6.38+ <stable@kernel.org>
parent f21169aa
...@@ -327,8 +327,10 @@ static void pcm1796_init(struct oxygen *chip) ...@@ -327,8 +327,10 @@ static void pcm1796_init(struct oxygen *chip)
{ {
struct xonar_pcm179x *data = chip->model_data; struct xonar_pcm179x *data = chip->model_data;
data->pcm1796_regs[0][18 - PCM1796_REG_BASE] = PCM1796_MUTE | data->pcm1796_regs[0][18 - PCM1796_REG_BASE] =
PCM1796_DMF_DISABLED | PCM1796_FMT_24_I2S | PCM1796_ATLD; PCM1796_DMF_DISABLED | PCM1796_FMT_24_I2S | PCM1796_ATLD;
if (!data->broken_i2c)
data->pcm1796_regs[0][18 - PCM1796_REG_BASE] |= PCM1796_MUTE;
data->pcm1796_regs[0][19 - PCM1796_REG_BASE] = data->pcm1796_regs[0][19 - PCM1796_REG_BASE] =
PCM1796_FLT_SHARP | PCM1796_ATS_1; PCM1796_FLT_SHARP | PCM1796_ATS_1;
data->pcm1796_regs[0][20 - PCM1796_REG_BASE] = data->pcm1796_regs[0][20 - PCM1796_REG_BASE] =
...@@ -1123,6 +1125,7 @@ int __devinit get_xonar_pcm179x_model(struct oxygen *chip, ...@@ -1123,6 +1125,7 @@ int __devinit get_xonar_pcm179x_model(struct oxygen *chip,
chip->model.control_filter = xonar_st_h6_control_filter; chip->model.control_filter = xonar_st_h6_control_filter;
chip->model.dac_channels_pcm = 8; chip->model.dac_channels_pcm = 8;
chip->model.dac_channels_mixer = 8; chip->model.dac_channels_mixer = 8;
chip->model.dac_volume_min = 255;
chip->model.dac_mclks = OXYGEN_MCLKS(256, 128, 128); chip->model.dac_mclks = OXYGEN_MCLKS(256, 128, 128);
break; break;
} }
......
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