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>
This commit is contained in:
parent
819ef70b13
commit
b6d7335001
|
@ -1137,7 +1137,8 @@ static long tumbler_find_device(const char *device, const char *platform,
|
||||||
gp->inactive_val = (*base) ? 0x4 : 0x5;
|
gp->inactive_val = (*base) ? 0x4 : 0x5;
|
||||||
} else {
|
} else {
|
||||||
const u32 *prop = NULL;
|
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->active_val = 0x4;
|
||||||
gp->inactive_val = 0x5;
|
gp->inactive_val = 0x5;
|
||||||
/* Here are some crude hacks to extract the GPIO polarity and
|
/* 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)
|
if (irq <= NO_IRQ)
|
||||||
irq = tumbler_find_device("line-output-detect",
|
irq = tumbler_find_device("line-output-detect",
|
||||||
NULL, &mix->line_detect, 1);
|
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;
|
mix->lineout_irq = irq;
|
||||||
|
|
||||||
tumbler_reset_audio(chip);
|
tumbler_reset_audio(chip);
|
||||||
|
|
Loading…
Reference in New Issue