]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ALSA] snd-powermac: enable headphone detection
authorRisto Suominen <Risto.Suominen@gmail.com>
Wed, 16 Apr 2008 11:15:38 +0000 (13:15 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 24 Apr 2008 10:00:38 +0000 (12:00 +0200)
Enable port change interrupt while initialising AWACS, Screamer, and
Burgundy chipsets.

Signed-off-by: Risto Suominen <Risto.Suominen@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/ppc/pmac.c

index 613a565e04de896ba11253d776e94b0dabc80c7d..6f68ac9982e4793d27b34d61cfb058a65633a00e 100644 (file)
@@ -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