[kernel] r16550 - in dists/sid/linux-2.6/debian: . patches/bugfix/powerpc patches/series

[Ben Hutchings]

Author: benh
Date: Mon Nov 15 01:39:28 2010
New Revision: 16550

Log:
[powerpc] ALSA: Fix headphone and line-out detection on PowerMac G4 DA (Closes: #603419)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/powerpc/ALSA-powermac-Lineout-detection-on-G4-DA.patch
   dists/sid/linux-2.6/debian/patches/bugfix/powerpc/ALSA-powermac-Reverse-HP-detection-on-G4-DA.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/28

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Nov 15 00:54:05 2010	(r16549)
+++ dists/sid/linux-2.6/debian/changelog	Mon Nov 15 01:39:28 2010	(r16550)
@@ -31,6 +31,8 @@
     - Add Italian (Luca Bruno) (Closes: #602945)
   * sunrpc: Fix NFS client over TCP hangs due to packet loss (Closes: #589945)
   * brcm80211: Update to 2.6.37-rc1
+  * [powerpc] ALSA: Fix headphone and line-out detection on PowerMac G4 DA
+    (Closes: #603419)
 
   [ dann frazier ]
   * [vserver] Update patch to 2.6.32.25-vs2.3.0.36.29.6

Added: dists/sid/linux-2.6/debian/patches/bugfix/powerpc/ALSA-powermac-Lineout-detection-on-G4-DA.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/powerpc/ALSA-powermac-Lineout-detection-on-G4-DA.patch	Mon Nov 15 01:39:28 2010	(r16550)
@@ -0,0 +1,41 @@
+From: Risto Suominen <Risto.Suominen at gmail.com>
+Date: Sun, 4 Apr 2010 08:00:00 +0300
+Subject: [PATCH 2/2] ALSA: powermac - Lineout detection on G4 DA
+
+commit b6d7335001f331f2d295ff15d67e385615ceff81 upstream.
+
+Lineout (Pro Speaker) detection on PowerMac G4 Digital Audio (Tumbler).
+
+Signed-off-by: Risto Suominen <Risto.Suominen at gmail.com>
+Signed-off-by: Takashi Iwai <tiwai at suse.de>
+---
+ sound/ppc/tumbler.c |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
+index 3b7471c..696280c 100644
+--- a/sound/ppc/tumbler.c
++++ b/sound/ppc/tumbler.c
+@@ -1137,7 +1137,8 @@ static long tumbler_find_device(const char *device, const char *platform,
+ 		gp->inactive_val = (*base) ? 0x4 : 0x5;
+ 	} else {
+ 		const u32 *prop = NULL;
+-		gp->active_state = IS_G4DA && !strcmp(device, "keywest-gpio15");
++		gp->active_state = IS_G4DA
++				&& !strncmp(device, "keywest-gpio1", 13);
+ 		gp->active_val = 0x4;
+ 		gp->inactive_val = 0x5;
+ 		/* Here are some crude hacks to extract the GPIO polarity and
+@@ -1315,6 +1316,9 @@ static int __devinit tumbler_init(struct snd_pmac *chip)
+  	if (irq <= NO_IRQ)
+ 		irq = tumbler_find_device("line-output-detect",
+ 					  NULL, &mix->line_detect, 1);
++	if (IS_G4DA && irq <= NO_IRQ)
++		irq = tumbler_find_device("keywest-gpio16",
++					  NULL, &mix->line_detect, 1);
+ 	mix->lineout_irq = irq;
+ 
+ 	tumbler_reset_audio(chip);
+-- 
+1.7.2.3
+

Added: dists/sid/linux-2.6/debian/patches/bugfix/powerpc/ALSA-powermac-Reverse-HP-detection-on-G4-DA.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/powerpc/ALSA-powermac-Reverse-HP-detection-on-G4-DA.patch	Mon Nov 15 01:39:28 2010	(r16550)
@@ -0,0 +1,47 @@
+From: Risto Suominen <Risto.Suominen at gmail.com>
+Date: Sun, 4 Apr 2010 07:59:30 +0300
+Subject: [PATCH 1/2] ALSA: powermac - Reverse HP detection on G4 DA
+
+commit 819ef70b135ba66cd1659c913255686bf931e3d4 upstream.
+
+Reverse headphone detection bit on PowerMac G4 Digital Audio (Tumbler).
+
+Signed-off-by: Risto Suominen <Risto.Suominen at gmail.com>
+Signed-off-by: Takashi Iwai <tiwai at suse.de>
+---
+ sound/ppc/tumbler.c |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
+index 789f44f..3b7471c 100644
+--- a/sound/ppc/tumbler.c
++++ b/sound/ppc/tumbler.c
+@@ -30,6 +30,7 @@
+ #include <linux/kmod.h>
+ #include <linux/slab.h>
+ #include <linux/interrupt.h>
++#include <linux/string.h>
+ #include <sound/core.h>
+ #include <asm/io.h>
+ #include <asm/irq.h>
+@@ -46,6 +47,8 @@
+ #define DBG(fmt...)
+ #endif
+ 
++#define IS_G4DA (machine_is_compatible("PowerMac3,4"))
++
+ /* i2c address for tumbler */
+ #define TAS_I2C_ADDR	0x34
+ 
+@@ -1134,7 +1137,7 @@ static long tumbler_find_device(const char *device, const char *platform,
+ 		gp->inactive_val = (*base) ? 0x4 : 0x5;
+ 	} else {
+ 		const u32 *prop = NULL;
+-		gp->active_state = 0;
++		gp->active_state = IS_G4DA && !strcmp(device, "keywest-gpio15");
+ 		gp->active_val = 0x4;
+ 		gp->inactive_val = 0x5;
+ 		/* Here are some crude hacks to extract the GPIO polarity and
+-- 
+1.7.2.3
+

Modified: dists/sid/linux-2.6/debian/patches/series/28
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/28	Mon Nov 15 00:54:05 2010	(r16549)
+++ dists/sid/linux-2.6/debian/patches/series/28	Mon Nov 15 01:39:28 2010	(r16550)
@@ -17,3 +17,5 @@
 + bugfix/all/sunrpc-fix-NFS-client-over-TCP-hangs-due-to-packet-loss.patch
 + features/all/brcm80211-2.6.37-rc1.patch
 + features/all/qlcnic-driver.patch
++ bugfix/powerpc/ALSA-powermac-Reverse-HP-detection-on-G4-DA.patch
++ bugfix/powerpc/ALSA-powermac-Lineout-detection-on-G4-DA.patch