rpms/kernel/F-10 linux-2.6-alsa-revo51-headphone.patch, NONE, 1.1 kernel.spec, 1.1132, 1.1133

[Dave Jones]

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13687

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-alsa-revo51-headphone.patch 
Log Message:
ALSA: revo51: add headphone output. (#470813)

linux-2.6-alsa-revo51-headphone.patch:

--- NEW FILE linux-2.6-alsa-revo51-headphone.patch ---
commit 46480b3a5f88f20dbf25d95fe74d7b4798d5bc86
Author: Alexander Beregalov <a.beregalov at gmail.com>
Date:   Thu Aug 21 08:28:42 2008 +0400

    ALSA: revo51: add headphone output
    
    It is ALSA bug #1754.
     D6 bit in 02 register is PW4.
    
    Signed-off-by: Alexander Beregalov <a.beregalov at gmail.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>
    Signed-off-by: Jaroslav Kysela <perex at perex.cz>

diff --git a/sound/i2c/other/ak4xxx-adda.c b/sound/i2c/other/ak4xxx-adda.c
index 288926d..ee47aba 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)
 		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 5e1b156..d219391 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[] = {
 	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:


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1132
retrieving revision 1.1133
diff -u -r1.1132 -r1.1133
--- kernel.spec	10 Nov 2008 23:25:36 -0000	1.1132
+++ kernel.spec	11 Nov 2008 17:40:29 -0000	1.1133
@@ -645,6 +645,7 @@
 
 Patch800: linux-2.6-alsa-ac97-whitelist.patch
 Patch801: linux-2.6-alsa-ac97-whitelist-AD1981B.patch
+Patch802: linux-2.6-alsa-revo51-headphone.patch
 
 Patch1101: linux-2.6-default-mmf_dump_elf_headers.patch
 Patch1515: linux-2.6.27-lirc.patch
@@ -1254,6 +1255,8 @@
 ApplyPatch linux-2.6-alsa-ac97-whitelist.patch
 ApplyPatch linux-2.6-alsa-ac97-whitelist-AD1981B.patch
 
+ApplyPatch linux-2.6-alsa-revo51-headphone.patch
+
 # build id related enhancements
 ApplyPatch linux-2.6-default-mmf_dump_elf_headers.patch
 
@@ -1903,6 +1906,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Nov 11 2008 Dave Jones <davej at redhat.com>
+- ALSA: revo51: add headphone output. (#470813)
+
 * Mon Nov 10 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.5-96
 - Fix "scheduling from idle thread" bug (#468896)