diff options
author | Risto Suominen <Risto.Suominen@gmail.com> | 2010-04-04 01:00:00 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-04-04 06:25:55 -0400 |
commit | b6d7335001f331f2d295ff15d67e385615ceff81 (patch) | |
tree | 7bb66af7e93dd2ad04c70be50afcceddc4d3f07a /sound/ppc | |
parent | 819ef70b135ba66cd1659c913255686bf931e3d4 (diff) |
ALSA: powermac - Lineout detection on G4 DA
Lineout (Pro Speaker) detection on PowerMac G4 Digital Audio (Tumbler).
Signed-off-by: Risto Suominen <Risto.Suominen@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/ppc')
-rw-r--r-- | 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 3b7471c344b4..696280c3c05a 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, | |||
1137 | gp->inactive_val = (*base) ? 0x4 : 0x5; | 1137 | gp->inactive_val = (*base) ? 0x4 : 0x5; |
1138 | } else { | 1138 | } else { |
1139 | const u32 *prop = NULL; | 1139 | const u32 *prop = NULL; |
1140 | gp->active_state = IS_G4DA && !strcmp(device, "keywest-gpio15"); | 1140 | gp->active_state = IS_G4DA |
1141 | && !strncmp(device, "keywest-gpio1", 13); | ||
1141 | gp->active_val = 0x4; | 1142 | gp->active_val = 0x4; |
1142 | gp->inactive_val = 0x5; | 1143 | gp->inactive_val = 0x5; |
1143 | /* Here are some crude hacks to extract the GPIO polarity and | 1144 | /* Here are some crude hacks to extract the GPIO polarity and |
@@ -1315,6 +1316,9 @@ static int __devinit tumbler_init(struct snd_pmac *chip) | |||
1315 | if (irq <= NO_IRQ) | 1316 | if (irq <= NO_IRQ) |
1316 | irq = tumbler_find_device("line-output-detect", | 1317 | irq = tumbler_find_device("line-output-detect", |
1317 | NULL, &mix->line_detect, 1); | 1318 | NULL, &mix->line_detect, 1); |
1319 | if (IS_G4DA && irq <= NO_IRQ) | ||
1320 | irq = tumbler_find_device("keywest-gpio16", | ||
1321 | NULL, &mix->line_detect, 1); | ||
1318 | mix->lineout_irq = irq; | 1322 | mix->lineout_irq = irq; |
1319 | 1323 | ||
1320 | tumbler_reset_audio(chip); | 1324 | tumbler_reset_audio(chip); |