Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6d73350 authored by Risto Suominen's avatar Risto Suominen Committed by Takashi Iwai
Browse files

ALSA: powermac - Lineout detection on G4 DA 



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

Signed-off-by: default avatarRisto Suominen <Risto.Suominen@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 819ef70b

sound/ppc/tumbler.c

+5 −1
Original line number Diff line number Diff line
@@ -1137,7 +1137,8 @@ static long tumbler_find_device(const char *device, const char *platform, 
		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 snd_pmac *chip) 
 	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);