leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: snd-aoa: Add a layout entry for PowerBook6,5

Browse Source 
Either one or a combination of commits 81e5d86
"Register i2c devices from device-tree" and 3a3dd01
"Improve detection of devices from device-tree" broke sound on
PowerBook6,5 machines.

Fix it by adding an entry to the new driver to match PowerBook6,5
machines.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Michael Ellerman 2013-05-06 11:01:05 +10:00 committed by Takashi Iwai
parent 478e858b2f
commit 088578617d
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/aoa/fabrics/layout.c
View File

@ -113,6 +113,7 @@ MODULE_ALIAS("sound-layout-100");
MODULE_ALIAS("aoa-device-id-14"); MODULE_ALIAS("aoa-device-id-14");
MODULE_ALIAS("aoa-device-id-22"); MODULE_ALIAS("aoa-device-id-22");
MODULE_ALIAS("aoa-device-id-35"); MODULE_ALIAS("aoa-device-id-35");
MODULE_ALIAS("aoa-device-id-44");
/* onyx with all but microphone connected */ /* onyx with all but microphone connected */
static struct codec_connection onyx_connections_nomic[] = { static struct codec_connection onyx_connections_nomic[] = {
@ -361,6 +362,13 @@ static struct layout layouts[] = {
.connections = tas_connections_nolineout, .connections = tas_connections_nolineout,
}, },
}, },
/* PowerBook6,5 */
{ .device_id = 44,
.codecs[0] = {
.name = "tas",
.connections = tas_connections_all,
},
},
/* PowerBook6,7 */ /* PowerBook6,7 */
{ .layout_id = 80, { .layout_id = 80,
.codecs[0] = { .codecs[0] = {

3
sound/aoa/soundbus/i2sbus/core.c
View File

@ -200,7 +200,8 @@ static int i2sbus_add_dev(struct macio_dev *macio,
* We probably cannot handle all device-id machines, * We probably cannot handle all device-id machines,
* so restrict to those we do handle for now. * so restrict to those we do handle for now.
*/ */
if (id && (*id == 22 || *id == 14 || *id == 35)) { if (id && (*id == 22 || *id == 14 || *id == 35 ||
*id == 44)) {
snprintf(dev->sound.modalias, 32, snprintf(dev->sound.modalias, 32,
"aoa-device-id-%d", *id); "aoa-device-id-%d", *id);
ok = 1; ok = 1;