On Wed, 2016-08-24 at 20:57 +0300, Aaro Koskinen wrote:
Enable sound on PowerBook G4 12".
Looks good to me, I assume you tested it and it works :)
johannes
Signed-off-by: Aaro Koskinen aaro.koskinen@iki.fi
sound/aoa/fabrics/layout.c | 8 ++++++++ sound/aoa/soundbus/i2sbus/core.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c index 8f71f7e..edc8681 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 1cbf210..000b585 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;