diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-05-01 08:58:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-01 08:58:43 -0700 |
| commit | 1f7b49d042abfbda71f41b8aff6e1bf7685c1f00 (patch) | |
| tree | 823c5b9d728fe11c42c9449b14f379164dd69e72 /sound/ppc/powermac.c | |
| parent | 4be8dc7ff69182610b40a078b9815bcdf27e0c49 (diff) | |
| download | linux-stable-1f7b49d042abfbda71f41b8aff6e1bf7685c1f00.tar.gz linux-stable-1f7b49d042abfbda71f41b8aff6e1bf7685c1f00.tar.bz2 linux-stable-1f7b49d042abfbda71f41b8aff6e1bf7685c1f00.zip | |
[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/powermac.c')
| -rw-r--r-- | sound/ppc/powermac.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c index 8f1953a8e290..231f6432ea6d 100644 --- a/sound/ppc/powermac.c +++ b/sound/ppc/powermac.c @@ -95,6 +95,13 @@ static int __init snd_pmac_probe(void) if ( snd_pmac_tumbler_init(chip) < 0 || snd_pmac_tumbler_post_init() < 0) goto __error; break; + case PMAC_TOONIE: + strcpy(card->driver, "PMac Toonie"); + strcpy(card->shortname, "PowerMac Toonie"); + strcpy(card->longname, card->shortname); + if ((err = snd_pmac_toonie_init(chip)) < 0) + goto __error; + break; case PMAC_AWACS: case PMAC_SCREAMER: name_ext = chip->model == PMAC_SCREAMER ? "Screamer" : "AWACS"; |