diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2006-06-28 07:59:50 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-06-28 13:31:31 -0400 |
commit | c6feefd03ed12d89af591345fb9c26de7098764d (patch) | |
tree | 7d8bc48a2601358d72d2e7839b4b331ce36661a7 /sound | |
parent | d91c4e8c63a61c2d9ec96fc6a9aa5a65d468befc (diff) |
[ALSA] snd-aoa: support iMac G5 iSight
This properly adds support for the iMac G5 iSight.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/aoa/fabrics/snd-aoa-fabric-layout.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sound/aoa/fabrics/snd-aoa-fabric-layout.c b/sound/aoa/fabrics/snd-aoa-fabric-layout.c index 04a7238e9494..cbc8a3b5cea4 100644 --- a/sound/aoa/fabrics/snd-aoa-fabric-layout.c +++ b/sound/aoa/fabrics/snd-aoa-fabric-layout.c | |||
@@ -94,6 +94,7 @@ MODULE_ALIAS("sound-layout-82"); | |||
94 | MODULE_ALIAS("sound-layout-84"); | 94 | MODULE_ALIAS("sound-layout-84"); |
95 | MODULE_ALIAS("sound-layout-86"); | 95 | MODULE_ALIAS("sound-layout-86"); |
96 | MODULE_ALIAS("sound-layout-92"); | 96 | MODULE_ALIAS("sound-layout-92"); |
97 | MODULE_ALIAS("sound-layout-96"); | ||
97 | 98 | ||
98 | /* onyx with all but microphone connected */ | 99 | /* onyx with all but microphone connected */ |
99 | static struct codec_connection onyx_connections_nomic[] = { | 100 | static struct codec_connection onyx_connections_nomic[] = { |
@@ -381,6 +382,13 @@ static struct layout layouts[] = { | |||
381 | .connections = toonie_connections, | 382 | .connections = toonie_connections, |
382 | }, | 383 | }, |
383 | }, | 384 | }, |
385 | { | ||
386 | .layout_id = 96, | ||
387 | .codecs[0] = { | ||
388 | .name = "onyx", | ||
389 | .connections = onyx_connections_noheadphones, | ||
390 | }, | ||
391 | }, | ||
384 | /* unknown, untested, but this comes from Apple */ | 392 | /* unknown, untested, but this comes from Apple */ |
385 | { .layout_id = 41, | 393 | { .layout_id = 41, |
386 | .codecs[0] = { | 394 | .codecs[0] = { |
@@ -479,12 +487,6 @@ static struct layout layouts[] = { | |||
479 | .connections = onyx_connections_noheadphones, | 487 | .connections = onyx_connections_noheadphones, |
480 | }, | 488 | }, |
481 | }, | 489 | }, |
482 | { .layout_id = 96, | ||
483 | .codecs[0] = { | ||
484 | .name = "onyx", | ||
485 | .connections = onyx_connections_noheadphones, | ||
486 | }, | ||
487 | }, | ||
488 | { .layout_id = 98, | 490 | { .layout_id = 98, |
489 | .codecs[0] = { | 491 | .codecs[0] = { |
490 | .name = "toonie", | 492 | .name = "toonie", |