Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08857861 authored by Michael Ellerman's avatar Michael Ellerman Committed by Takashi Iwai
Browse files

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



Either one or a combination of commits 81e5d864
"Register i2c devices from device-tree" and 3a3dd018
"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: default avatarMichael Ellerman <michael@ellerman.id.au>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 478e858b

sound/aoa/fabrics/layout.c

+8 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ MODULE_ALIAS("sound-layout-100"); 
MODULE_ALIAS("aoa-device-id-14");

MODULE_ALIAS("aoa-device-id-22");

MODULE_ALIAS("aoa-device-id-35");

MODULE_ALIAS("aoa-device-id-44");



/* onyx with all but microphone connected */

static struct codec_connection onyx_connections_nomic[] = {
@@ -361,6 +362,13 @@ static struct layout layouts[] = { 
		.connections = tas_connections_nolineout,

	  },

	},

	/* PowerBook6,5 */

	{ .device_id = 44,

	  .codecs[0] = {

		.name = "tas",

		.connections = tas_connections_all,

	  },

	},

	/* PowerBook6,7 */

	{ .layout_id = 80,

	  .codecs[0] = {

sound/aoa/soundbus/i2sbus/core.c

+2 −1
Original line number Diff line number Diff line
@@ -200,7 +200,8 @@ static int i2sbus_add_dev(struct macio_dev *macio, 
			 * We probably cannot handle all device-id machines,

			 * 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,

					 "aoa-device-id-%d", *id);

				ok = 1;