This is a note to let you know that I've just added the patch titled
ALSA: powermac - Lineout detection on G4 DA
to the 2.6.32-longterm tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/longterm/longterm-queue-2.6.32.git;a=summary
The filename of the patch is:
alsa-powermac-lineout-detection-on-g4-da.patch
and it can be found in the queue-2.6.32 subdirectory.
If you, or anyone else, feels it should not be added to the 2.6.32 longterm
tree,
please let <[email protected]> know about it.
>From 66e71ce984163035fd9a5372896006268d0e748a Mon Sep 17 00:00:00 2001
From: Risto Suominen <[email protected]>
Date: Sun, 4 Apr 2010 08:00:00 +0300
Subject: ALSA: powermac - Lineout detection on G4 DA
From: Risto Suominen <[email protected]>
commit b6d7335001f331f2d295ff15d67e385615ceff81 upstream.
Lineout (Pro Speaker) detection on PowerMac G4 Digital Audio (Tumbler).
Signed-off-by: Risto Suominen <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
sound/ppc/tumbler.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/sound/ppc/tumbler.c
+++ b/sound/ppc/tumbler.c
@@ -1137,7 +1137,8 @@ static long tumbler_find_device(const ch
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
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);
Patches currently in longterm-queue-2.6.32 which might be from
[email protected] are
/home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/alsa-powermac-lineout-detection-on-g4-da.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/alsa-powermac-reverse-hp-detection-on-g4-da.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
