From: Risto Suominen Date: Wed, 16 Apr 2008 11:15:38 +0000 (+0200) Subject: [ALSA] snd-powermac: enable headphone detection X-Git-Tag: v2.6.26-rc1~1087^2~38 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9a4f20fcbd9cd89d8e4cfcaece81802c19d467ae;p=linux-2.6-omap-h63xx.git [ALSA] snd-powermac: enable headphone detection Enable port change interrupt while initialising AWACS, Screamer, and Burgundy chipsets. Signed-off-by: Risto Suominen Signed-off-by: Takashi Iwai --- diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c index 613a565e04d..6f68ac9982e 100644 --- a/sound/ppc/pmac.c +++ b/sound/ppc/pmac.c @@ -1300,9 +1300,9 @@ int __init snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return) snd_pmac_sound_feature(chip, 1); - /* reset */ - if (chip->model == PMAC_AWACS) - out_le32(&chip->awacs->control, 0x11); + /* reset & enable interrupts */ + if (chip->model <= PMAC_BURGUNDY) + out_le32(&chip->awacs->control, chip->control_mask); /* Powerbooks have odd ways of enabling inputs such as an expansion-bay CD or sound from an internal modem