diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2016-08-24 20:57:47 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-08-25 16:48:54 +0200 |
| commit | 34b64e5ebffc5e4a9dbf8735561c4159a936248f (patch) | |
| tree | 90ba9ca82b0b94f4bbb9356663e46388e0d652fc /sound/aoa | |
| parent | e15c282eff54aaf4c5ed72d492da7060d14f7be8 (diff) | |
| download | linux-stable-34b64e5ebffc5e4a9dbf8735561c4159a936248f.tar.gz linux-stable-34b64e5ebffc5e4a9dbf8735561c4159a936248f.tar.bz2 linux-stable-34b64e5ebffc5e4a9dbf8735561c4159a936248f.zip | |
ALSA: snd-aoa: enable sound on PowerBook G4 12"
Enable sound on PowerBook G4 12".
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/aoa')
| -rw-r--r-- | sound/aoa/fabrics/layout.c | 8 | ||||
| -rw-r--r-- | sound/aoa/soundbus/i2sbus/core.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c index 8f71f7e4d966..edc868196e11 100644 --- a/sound/aoa/fabrics/layout.c +++ b/sound/aoa/fabrics/layout.c @@ -112,6 +112,7 @@ MODULE_ALIAS("sound-layout-100"); MODULE_ALIAS("aoa-device-id-14"); MODULE_ALIAS("aoa-device-id-22"); +MODULE_ALIAS("aoa-device-id-31"); MODULE_ALIAS("aoa-device-id-35"); MODULE_ALIAS("aoa-device-id-44"); @@ -362,6 +363,13 @@ static struct layout layouts[] = { .connections = tas_connections_nolineout, }, }, + /* PowerBook6,1 */ + { .device_id = 31, + .codecs[0] = { + .name = "tas", + .connections = tas_connections_nolineout, + }, + }, /* PowerBook6,5 */ { .device_id = 44, .codecs[0] = { diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c index 1cbf210080a1..000b58522106 100644 --- a/sound/aoa/soundbus/i2sbus/core.c +++ b/sound/aoa/soundbus/i2sbus/core.c @@ -197,7 +197,7 @@ static int i2sbus_add_dev(struct macio_dev *macio, * so restrict to those we do handle for now. */ if (id && (*id == 22 || *id == 14 || *id == 35 || - *id == 44)) { + *id == 31 || *id == 44)) { snprintf(dev->sound.modalias, 32, "aoa-device-id-%d", *id); ok = 1; |