From: Risto Suominen <Risto.Suominen@gmail.com>
To: tiwai@suse.de
Cc: alsa-devel@alsa-project.org, Risto Suominen <Risto.Suominen@gmail.com>
Subject: [PATCH - snd-powermac 1/5] Correct HP detection and input selectors for PMac 5500
Date: Tue, 20 Jan 2009 22:01:13 +0200 [thread overview]
Message-ID: <1232481677-11579-1-git-send-email-Risto.Suominen@gmail.com> (raw)
In-Reply-To: <>
Correct headphone detection and input selectors for PowerMac 5500 (AWACS).
Signed-off-by: Risto Suominen <Risto.Suominen@gmail.com>
diff --git a/sound/ppc/awacs.c b/sound/ppc/awacs.c
index 7bd33e6..0258ccb 100644
--- a/sound/ppc/awacs.c
+++ b/sound/ppc/awacs.c
@@ -767,6 +767,7 @@ static void snd_pmac_awacs_resume(struct snd_pmac *chip)
#endif /* CONFIG_PM */
#define IS_PM7500 (machine_is_compatible("AAPL,7500"))
+#define IS_PM5500 (machine_is_compatible("AAPL,e411"))
#define IS_BEIGE (machine_is_compatible("AAPL,Gossamer"))
#define IS_IMAC1 (machine_is_compatible("PowerMac2,1"))
#define IS_IMAC2 (machine_is_compatible("PowerMac2,2") \
@@ -858,6 +859,7 @@ int __init
snd_pmac_awacs_init(struct snd_pmac *chip)
{
int pm7500 = IS_PM7500;
+ int pm5500 = IS_PM5500;
int beige = IS_BEIGE;
int g4agp = IS_G4AGP;
int imac;
@@ -915,7 +917,7 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
/* set headphone-jack detection bit */
switch (chip->model) {
case PMAC_AWACS:
- chip->hp_stat_mask = pm7500 ? MASK_HDPCONN
+ chip->hp_stat_mask = pm7500 || pm5500 ? MASK_HDPCONN
: MASK_LOCONN;
break;
case PMAC_SCREAMER:
@@ -954,7 +956,7 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
return err;
if (beige || g4agp)
;
- else if (chip->model == PMAC_SCREAMER)
+ else if (chip->model == PMAC_SCREAMER || pm5500)
err = build_mixers(chip, ARRAY_SIZE(snd_pmac_screamer_mixers2),
snd_pmac_screamer_mixers2);
else if (!pm7500)
--
1.5.4.3
next reply other threads:[~2009-01-20 20:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-20 20:01 Risto Suominen [this message]
2009-01-20 20:01 ` [PATCH - snd-powermac 2/5] Correct volume controls for PowerBook G3 Lombard Risto Suominen
2009-01-20 20:01 ` [PATCH - snd-powermac 3/5] Correct volume controls and HP detection for PMac 8500/9500 Risto Suominen
2009-01-20 20:01 ` [PATCH - snd-powermac 4/5] Allow input from mic in iBook G3 Dual-USB Risto Suominen
2009-01-20 20:01 ` [PATCH - snd-powermac 5/5] Add vmaster controls for Pmac 5500, iMac G3 SL, and PBook G3 Lombard Risto Suominen
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=1232481677-11579-1-git-send-email-Risto.Suominen@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.