alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Risto Suominen <risto.suominen@gmail.com>
To: Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel <alsa-devel@alsa-project.org>,
	"Risto.Suominen" <Risto.Suominen@gmail.com>
Subject: [PATCH - powermac] Lineout detection on G4 DA
Date: Sun, 4 Apr 2010 08:00:00 +0300	[thread overview]
Message-ID: <p2g46e1c7761004032200wb6c3a436t752b878c5e92480@mail.gmail.com> (raw)

From: Risto Suominen <Risto.Suominen@gmail.com>

Lineout (Pro Speaker) detection on PowerMac G4 Digital Audio (Tumbler).

Signed-off-by: Risto Suominen <Risto.Suominen@gmail.com>
---
Kernel version 2.6.32.9 (probably any 2.6), ALSA 1.0.22.1.

The patch is available here, too:
http://ristosu.wippiespace.com/pub/alsa-tumbler-1.0.22.1-p16.diff

This has not been tested. Hopefully someone with that kind of machine
and those speakers can do it.

--- a/alsa-kernel/ppc/tumbler.c-p15	2010-03-16 19:59:01.000000000 +0200
+++ b/alsa-kernel/ppc/tumbler.c	2010-03-23 21:42:03.000000000 +0200
@@ -1137,7 +1141,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 +1320,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);

                 reply	other threads:[~2010-04-04  5:00 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=p2g46e1c7761004032200wb6c3a436t752b878c5e92480@mail.gmail.com \
    --to=risto.suominen@gmail.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).