ALSA: snd-aoa: Add a layout entry for PowerBook6,5
Either one or a combination of commits81e5d86
"Register i2c devices from device-tree" and3a3dd01
"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:
Родитель
478e858b2f
Коммит
088578617d
|
@ -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] = {
|
||||
|
|
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче