ALSA: revo51: add headphone output

It is ALSA bug #1754.
 D6 bit in 02 register is PW4.

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/sound/i2c/other/ak4xxx-adda.c b/sound/i2c/other/ak4xxx-adda.c
index 288926d2e2054b2706d8749b6be8ff8290bd1911..ee47abab764ed5a90f6e1cc70f941cd353249f29 100644 (file)
--- 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)
                0x01, 0x02, /* 1: reset and soft-mute */
                0x00, 0x06, /* 0: mode3(i2s), disable auto-clock detect,
                             * disable DZF, sharp roll-off, RSTN#=0 */
-               0x02, 0x0e, /* 2: DA's power up, normal speed, RSTN#=0 */
-               // 0x02, 0x2e, /* quad speed */
+               0x02, 0x4e, /* 2: DA's power up, normal speed, RSTN#=0 */
+               /* 0x02, 0x6e,*/ /* quad speed */
                0x03, 0x01, /* 3: de-emphasis off */
                0x04, 0x00, /* 4: LOUT1 volume muted */
                0x05, 0x00, /* 5: ROUT1 volume muted */

diff --git a/sound/pci/ice1712/revo.c b/sound/pci/ice1712/revo.c
index 5e1b156bfaa7248fa9f302184480a604e951dfb5..d2193913d703e2c4f04309fc73d830ed9d81dd13 100644 (file)
--- 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[] = {
        AK_DAC("PCM Center Playback Volume", 1),
        AK_DAC("PCM LFE Playback Volume", 1),
        AK_DAC("PCM Rear Playback Volume", 2),
+       AK_DAC("PCM Headphone Volume", 2),
 };
 
 static const char *revo51_adc_input_names[] = {
@@ -279,7 +280,7 @@ static struct snd_ak4xxx_private akm_revo_surround_priv __devinitdata = {
 
 static struct snd_akm4xxx akm_revo51 __devinitdata = {
        .type = SND_AK4358,
-       .num_dacs = 6,
+       .num_dacs = 8,
        .ops = {
                .set_rate_val = revo_set_rate_val
        },
@@ -508,7 +509,7 @@ static int __devinit revo_init(struct snd_ice1712 *ice)
                ice->gpio.i2s_mclk_changed = revo_i2s_mclk_changed;
                break;
        case VT1724_SUBDEVICE_REVOLUTION51:
-               ice->num_total_dacs = 6;
+               ice->num_total_dacs = 8;
                ice->num_total_adcs = 2;
                break;
        case VT1724_SUBDEVICE_AUDIOPHILE192: