aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/i2c/other/ak4xxx-adda.c4
-rw-r--r--sound/pci/ice1712/revo.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/sound/i2c/other/ak4xxx-adda.c b/sound/i2c/other/ak4xxx-adda.c
index 288926d2e205..ee47abab764e 100644
--- a/sound/i2c/other/ak4xxx-adda.c
+++ b/sound/i2c/other/ak4xxx-adda.c
@@ -233,8 +233,8 @@ void snd_akm4xxx_init(struct snd_akm4xxx *ak)
233 0x01, 0x02, /* 1: reset and soft-mute */ 233 0x01, 0x02, /* 1: reset and soft-mute */
234 0x00, 0x06, /* 0: mode3(i2s), disable auto-clock detect, 234 0x00, 0x06, /* 0: mode3(i2s), disable auto-clock detect,
235 * disable DZF, sharp roll-off, RSTN#=0 */ 235 * disable DZF, sharp roll-off, RSTN#=0 */
236 0x02, 0x0e, /* 2: DA's power up, normal speed, RSTN#=0 */ 236 0x02, 0x4e, /* 2: DA's power up, normal speed, RSTN#=0 */
237 // 0x02, 0x2e, /* quad speed */ 237 /* 0x02, 0x6e,*/ /* quad speed */
238 0x03, 0x01, /* 3: de-emphasis off */ 238 0x03, 0x01, /* 3: de-emphasis off */
239 0x04, 0x00, /* 4: LOUT1 volume muted */ 239 0x04, 0x00, /* 4: LOUT1 volume muted */
240 0x05, 0x00, /* 5: ROUT1 volume muted */ 240 0x05, 0x00, /* 5: ROUT1 volume muted */
diff --git a/sound/pci/ice1712/revo.c b/sound/pci/ice1712/revo.c
index 5e1b156bfaa7..d2193913d703 100644
--- a/sound/pci/ice1712/revo.c
+++ b/sound/pci/ice1712/revo.c
@@ -216,6 +216,7 @@ static const struct snd_akm4xxx_dac_channel revo51_dac[] = {
216 AK_DAC("PCM Center Playback Volume", 1), 216 AK_DAC("PCM Center Playback Volume", 1),
217 AK_DAC("PCM LFE Playback Volume", 1), 217 AK_DAC("PCM LFE Playback Volume", 1),
218 AK_DAC("PCM Rear Playback Volume", 2), 218 AK_DAC("PCM Rear Playback Volume", 2),
219 AK_DAC("PCM Headphone Volume", 2),
219}; 220};
220 221
221static const char *revo51_adc_input_names[] = { 222static const char *revo51_adc_input_names[] = {
@@ -279,7 +280,7 @@ static struct snd_ak4xxx_private akm_revo_surround_priv __devinitdata = {
279 280
280static struct snd_akm4xxx akm_revo51 __devinitdata = { 281static struct snd_akm4xxx akm_revo51 __devinitdata = {
281 .type = SND_AK4358, 282 .type = SND_AK4358,
282 .num_dacs = 6, 283 .num_dacs = 8,
283 .ops = { 284 .ops = {
284 .set_rate_val = revo_set_rate_val 285 .set_rate_val = revo_set_rate_val
285 }, 286 },
@@ -508,7 +509,7 @@ static int __devinit revo_init(struct snd_ice1712 *ice)
508 ice->gpio.i2s_mclk_changed = revo_i2s_mclk_changed; 509 ice->gpio.i2s_mclk_changed = revo_i2s_mclk_changed;
509 break; 510 break;
510 case VT1724_SUBDEVICE_REVOLUTION51: 511 case VT1724_SUBDEVICE_REVOLUTION51:
511 ice->num_total_dacs = 6; 512 ice->num_total_dacs = 8;
512 ice->num_total_adcs = 2; 513 ice->num_total_adcs = 2;
513 break; 514 break;
514 case VT1724_SUBDEVICE_AUDIOPHILE192: 515 case VT1724_SUBDEVICE_AUDIOPHILE192: