diff options
-rw-r--r-- | sound/aoa/fabrics/layout.c | 8 | ||||
-rw-r--r-- | sound/aoa/soundbus/i2sbus/core.c | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c index 552b97afbca5..61ab640e195f 100644 --- a/sound/aoa/fabrics/layout.c +++ b/sound/aoa/fabrics/layout.c | |||
@@ -113,6 +113,7 @@ MODULE_ALIAS("sound-layout-100"); | |||
113 | MODULE_ALIAS("aoa-device-id-14"); | 113 | MODULE_ALIAS("aoa-device-id-14"); |
114 | MODULE_ALIAS("aoa-device-id-22"); | 114 | MODULE_ALIAS("aoa-device-id-22"); |
115 | MODULE_ALIAS("aoa-device-id-35"); | 115 | MODULE_ALIAS("aoa-device-id-35"); |
116 | MODULE_ALIAS("aoa-device-id-44"); | ||
116 | 117 | ||
117 | /* onyx with all but microphone connected */ | 118 | /* onyx with all but microphone connected */ |
118 | static struct codec_connection onyx_connections_nomic[] = { | 119 | static struct codec_connection onyx_connections_nomic[] = { |
@@ -361,6 +362,13 @@ static struct layout layouts[] = { | |||
361 | .connections = tas_connections_nolineout, | 362 | .connections = tas_connections_nolineout, |
362 | }, | 363 | }, |
363 | }, | 364 | }, |
365 | /* PowerBook6,5 */ | ||
366 | { .device_id = 44, | ||
367 | .codecs[0] = { | ||
368 | .name = "tas", | ||
369 | .connections = tas_connections_all, | ||
370 | }, | ||
371 | }, | ||
364 | /* PowerBook6,7 */ | 372 | /* PowerBook6,7 */ |
365 | { .layout_id = 80, | 373 | { .layout_id = 80, |
366 | .codecs[0] = { | 374 | .codecs[0] = { |
diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c index 010658335881..15e76131b501 100644 --- a/sound/aoa/soundbus/i2sbus/core.c +++ b/sound/aoa/soundbus/i2sbus/core.c | |||
@@ -200,7 +200,8 @@ static int i2sbus_add_dev(struct macio_dev *macio, | |||
200 | * We probably cannot handle all device-id machines, | 200 | * We probably cannot handle all device-id machines, |
201 | * so restrict to those we do handle for now. | 201 | * so restrict to those we do handle for now. |
202 | */ | 202 | */ |
203 | if (id && (*id == 22 || *id == 14 || *id == 35)) { | 203 | if (id && (*id == 22 || *id == 14 || *id == 35 || |
204 | *id == 44)) { | ||
204 | snprintf(dev->sound.modalias, 32, | 205 | snprintf(dev->sound.modalias, 32, |
205 | "aoa-device-id-%d", *id); | 206 | "aoa-device-id-%d", *id); |
206 | ok = 1; | 207 | ok = 1; |