summaryrefslogtreecommitdiff
path: root/sound/ppc/pmac.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2005-05-01 15:58:43 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-01 15:58:43 (GMT)
commit1f7b49d042abfbda71f41b8aff6e1bf7685c1f00 (patch)
tree823c5b9d728fe11c42c9449b14f379164dd69e72 /sound/ppc/pmac.c
parent4be8dc7ff69182610b40a078b9815bcdf27e0c49 (diff)
downloadlinux-1f7b49d042abfbda71f41b8aff6e1bf7685c1f00.tar.xz
[PATCH] ppc32: add sound support for Mac Mini
This patch applies on top of my previous g5 related sound patches and adds support for the Mac Mini to the PowerMac Alsa driver. However, I haven't found any kind of HW support for volume control on this machine. If it exist, it's well hidden. That means that you probably want to make sure you use software with the ability to do soft volume control, or use Alsa 0.9 pre-release with the softvol plugin. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/ppc/pmac.c')
-rw-r--r--sound/ppc/pmac.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 3bf5f06..32d9475 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -986,7 +986,13 @@ static int __init snd_pmac_detect(pmac_t *chip)
chip->num_freqs = ARRAY_SIZE(tumbler_freqs);
chip->model = PMAC_SNAPPER;
chip->can_byte_swap = 0; /* FIXME: check this */
- chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */
+ chip->control_mask = MASK_IEPC | 0x11;/* disable IEE */
+ break;
+ case 0x3a:
+ chip->num_freqs = ARRAY_SIZE(tumbler_freqs);
+ chip->model = PMAC_TOONIE;
+ chip->can_byte_swap = 0; /* FIXME: check this */
+ chip->control_mask = MASK_IEPC | 0x11;/* disable IEE */
break;
}
}