]> err.no Git - linux-2.6/commitdiff
[ALSA] snd_powermac: Add ID for Spring 2005 17' Powerbook
authorKyle Moffett <mrmacman_g4@mac.com>
Wed, 30 Nov 2005 09:54:28 +0000 (10:54 +0100)
committerJaroslav Kysela <perex@suse.cz>
Tue, 3 Jan 2006 11:30:01 +0000 (12:30 +0100)
Modules: PPC PMAC driver

The audio chip in my Spring 2005 17' PowerBook was incorrectly
recognized as an AWACS chip.  This adds the chip ID to the
snd_powermac driver such that it is recognized as a Toonie (I don't
know if that's correct, but it's the only one that makes it work at
all). and sorts the ID lists numerically.  NOTE:  This chip is only
minimally supported at this point; it has system beep support and
very low volume speaker output, and that's about it.

Signed-off-by: Kyle Moffett <mrmacman_g4@mac.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/ppc/pmac.c

index 4f0a4204516d6d7d87befcd5d90bd62bf64a5ef2..d70292cd1775be49af88e7c2606d6784f91b3c38 100644 (file)
@@ -973,11 +973,11 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
                 * single frequency until proper i2s control is implemented
                 */
                switch(layout_id) {
-               case 0x48:
-               case 0x46:
-               case 0x33:
-               case 0x29:
                case 0x24:
+               case 0x29:
+               case 0x33:
+               case 0x46:
+               case 0x48:
                case 0x50:
                case 0x5c:
                        chip->num_freqs = ARRAY_SIZE(tumbler_freqs);
@@ -986,6 +986,7 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
                        chip->control_mask = MASK_IEPC | 0x11;/* disable IEE */
                        break;
                case 0x3a:
+               case 0x40:
                        chip->num_freqs = ARRAY_SIZE(tumbler_freqs);
                        chip->model = PMAC_TOONIE;
                        chip->can_byte_swap = 0; /* FIXME: check this */