diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/oxygen/xonar_pcm179x.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/oxygen/xonar_pcm179x.c b/sound/pci/oxygen/xonar_pcm179x.c index 5ec164a70cf2..051554e2f928 100644 --- a/sound/pci/oxygen/xonar_pcm179x.c +++ b/sound/pci/oxygen/xonar_pcm179x.c | |||
@@ -326,7 +326,7 @@ static void pcm1796_init(struct oxygen *chip) | |||
326 | struct xonar_pcm179x *data = chip->model_data; | 326 | struct xonar_pcm179x *data = chip->model_data; |
327 | 327 | ||
328 | data->pcm1796_regs[0][18 - PCM1796_REG_BASE] = PCM1796_MUTE | | 328 | data->pcm1796_regs[0][18 - PCM1796_REG_BASE] = PCM1796_MUTE | |
329 | PCM1796_DMF_DISABLED | PCM1796_FMT_24_LJUST | PCM1796_ATLD; | 329 | PCM1796_DMF_DISABLED | PCM1796_FMT_24_I2S | PCM1796_ATLD; |
330 | data->pcm1796_regs[0][19 - PCM1796_REG_BASE] = | 330 | data->pcm1796_regs[0][19 - PCM1796_REG_BASE] = |
331 | PCM1796_FLT_SHARP | PCM1796_ATS_1; | 331 | PCM1796_FLT_SHARP | PCM1796_ATS_1; |
332 | data->pcm1796_regs[0][20 - PCM1796_REG_BASE] = PCM1796_OS_64; | 332 | data->pcm1796_regs[0][20 - PCM1796_REG_BASE] = PCM1796_OS_64; |
@@ -620,7 +620,7 @@ static void update_pcm1796_mute(struct oxygen *chip) | |||
620 | unsigned int i; | 620 | unsigned int i; |
621 | u8 value; | 621 | u8 value; |
622 | 622 | ||
623 | value = PCM1796_DMF_DISABLED | PCM1796_FMT_24_LJUST | PCM1796_ATLD; | 623 | value = PCM1796_DMF_DISABLED | PCM1796_FMT_24_I2S | PCM1796_ATLD; |
624 | if (chip->dac_mute) | 624 | if (chip->dac_mute) |
625 | value |= PCM1796_MUTE; | 625 | value |= PCM1796_MUTE; |
626 | for (i = 0; i < data->dacs; ++i) | 626 | for (i = 0; i < data->dacs; ++i) |
@@ -1106,7 +1106,7 @@ static const struct oxygen_model model_xonar_d2 = { | |||
1106 | .misc_flags = OXYGEN_MISC_MIDI, | 1106 | .misc_flags = OXYGEN_MISC_MIDI, |
1107 | .function_flags = OXYGEN_FUNCTION_SPI | | 1107 | .function_flags = OXYGEN_FUNCTION_SPI | |
1108 | OXYGEN_FUNCTION_ENABLE_SPI_4_5, | 1108 | OXYGEN_FUNCTION_ENABLE_SPI_4_5, |
1109 | .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | 1109 | .dac_i2s_format = OXYGEN_I2S_FORMAT_I2S, |
1110 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | 1110 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, |
1111 | }; | 1111 | }; |
1112 | 1112 | ||
@@ -1139,7 +1139,7 @@ static const struct oxygen_model model_xonar_hdav = { | |||
1139 | .dac_volume_max = 255, | 1139 | .dac_volume_max = 255, |
1140 | .misc_flags = OXYGEN_MISC_MIDI, | 1140 | .misc_flags = OXYGEN_MISC_MIDI, |
1141 | .function_flags = OXYGEN_FUNCTION_2WIRE, | 1141 | .function_flags = OXYGEN_FUNCTION_2WIRE, |
1142 | .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | 1142 | .dac_i2s_format = OXYGEN_I2S_FORMAT_I2S, |
1143 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | 1143 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, |
1144 | }; | 1144 | }; |
1145 | 1145 | ||
@@ -1169,7 +1169,7 @@ static const struct oxygen_model model_xonar_st = { | |||
1169 | .dac_volume_min = 255 - 2*60, | 1169 | .dac_volume_min = 255 - 2*60, |
1170 | .dac_volume_max = 255, | 1170 | .dac_volume_max = 255, |
1171 | .function_flags = OXYGEN_FUNCTION_2WIRE, | 1171 | .function_flags = OXYGEN_FUNCTION_2WIRE, |
1172 | .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | 1172 | .dac_i2s_format = OXYGEN_I2S_FORMAT_I2S, |
1173 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | 1173 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, |
1174 | }; | 1174 | }; |
1175 | 1175 | ||