rpms/kernel/devel linux-2.6-olpc-speaker-out.patch, NONE, 1.1 TODO, 1.35, 1.36 kernel.spec, 1.1095, 1.1096

[Jeremy Katz]

Author: katzj

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17574

Modified Files:
	TODO kernel.spec 
Added Files:
	linux-2.6-olpc-speaker-out.patch 
Log Message:
* Tue Oct 28 2008 Jeremy Katz <katzj at redhat.com>
- add fix for speaker output on OLPC (#466038)


linux-2.6-olpc-speaker-out.patch:

--- NEW FILE linux-2.6-olpc-speaker-out.patch ---
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
index 1d8b160..640f157 100644
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
@@ -28,6 +28,7 @@
 #include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <asm/io.h>
+#include <asm/olpc.h>
 #include <sound/core.h>
 #include <sound/control.h>
 #include <sound/pcm.h>
@@ -163,6 +164,9 @@ static int __devinit snd_cs5535audio_mixer(struct cs5535audio *cs5535au)
 	ac97.private_data = cs5535au;
 	ac97.pci = cs5535au->pci;
 
+	if (machine_is_olpc())
+		ac97.scaps |= AC97_SCAP_INV_EAPD;
+
 	if ((err = snd_ac97_mixer(pbus, &ac97, &cs5535au->ac97)) < 0) {
 		snd_printk(KERN_ERR "mixer failed\n");
 		return err;


Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/TODO,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- TODO	27 Oct 2008 16:51:19 -0000	1.35
+++ TODO	28 Oct 2008 02:12:22 -0000	1.36
@@ -200,3 +200,7 @@
 linux-2.6-r8169-wake-up-the-phy-of-the-8168.patch
 	Selected patches from the r8169 2.6.28 driver.
 	Should go to stable after confirming they fix reported bugs.
+
+linux-2.6-olpc-speaker-out.patch
+	Enables speaker output by default on OLPC, going to get review from
+	OLPC folks and then to upstream for .28


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1095
retrieving revision 1.1096
diff -u -r1.1095 -r1.1096
--- kernel.spec	27 Oct 2008 22:06:53 -0000	1.1095
+++ kernel.spec	28 Oct 2008 02:12:22 -0000	1.1096
@@ -678,6 +678,9 @@
 # Fix DEBUG_SHIRQ problem in tulip driver.  (454575)
 Patch2030: linux-2.6-net-tulip-interrupt.patch
 
+# olpc fixes
+Patch2040: linux-2.6-olpc-speaker-out.patch
+
 # linux1394 git patches
 Patch2200: linux-2.6-firewire-git-update.patch
 
@@ -1271,6 +1274,8 @@
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
+ApplyPatch linux-2.6-olpc-speaker-out.patch
+
 # Nouveau DRM + drm fixes
 ApplyPatch nvidia-agp.patch
 ApplyPatch linux-2.6-agp-intel-cantiga-fix.patch
@@ -1878,6 +1883,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Oct 28 2008 Jeremy Katz <katzj at redhat.com>
+- add fix for speaker output on OLPC (#466038)
+
 * Tue Oct 28 2008 John W. Linville <linville at redhat.com>
 - iwl3945 fix for stable ad-hoc mode connections (#459401)