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

PATCH New Adam Smith 1 participant 1 message Mar 27, 2014

Subsystems (2)

Sound Aoa (Apple Onboard Audio) ALSA driver

lore

Share & tools

lore

Adam Smith

author

2014-03-27 11:53 UTC #0 lore raw

PATCH 1/1 ALSA: snd-aoa: Add another layout entry for PowerBook6,5

Either one or a combination of commits 3a3dd0186f619b74e61e6f29dddcaf59af7d3cac "Improve detection of devices from device-tree" and 26b0d14106954ae46d2f4f7eec3481828a210f7d "Adapt to new i2c probing scheme" broke the snd-powermac module for my PowerBook6,5 machine (12" iBook late 2004). As I understand things, these machines should be moving over to use snd-aoa.

The attached patch (against a 3.13.0 kernel) creates a new snd-aoa layout entry for PowerBook6,5 machines. I've tested it on my iBook and sound now appears to be fully working. The module snd-aoa-i2sbus needs to be added to /etc/modules to ensure all the necessary snd-aoa modules are loaded.

Signed-off-by Adam Smith <[email protected]>

sound/aoa/fabrics/layout.c +7 -0

diff -uprN a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c
@@ -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-38");
 MODULE_ALIAS("aoa-device-id-44");
 
 /* onyx with all but microphone connected */

@@ -363,6 +364,12 @@ static struct layout layouts[] = {
 	  },
 	},
 	/* PowerBook6,5 */
+	{ .device_id = 38,
+	  .codecs[0] = {
+		.name = "tas",
+		.connections = tas_connections_noline,
+	  },
+	},
 	{ .device_id = 44,
 	  .codecs[0] = {
 		.name = "tas",

sound/aoa/soundbus/i2sbus/core.c +1 -1

diff -uprN a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c
@@ -203,7 +203,7 @@ static int i2sbus_add_dev(struct macio_d
 			 * so restrict to those we do handle for now.
 			 */
 			if (id && (*id == 22 || *id == 14 || *id == 35 ||
-				   *id == 44)) {
+				   *id == 38 || *id == 44)) {
 				snprintf(dev->sound.modalias, 32,
 					 "aoa-device-id-%d", *id);
 				ok = 1;