ALSA: snd-aoa: Add a layout entry for PowerBook6, 5]
Subsystems (2)
PATCH 1/1 ALSA: snd-aoa: Add a layout entry for PowerBook6, 5]
Either one or a combination of commits 81e5d86 "Register i2c devices from device-tree" and 3a3dd01 "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.
--- sound/aoa/fabrics/layout.c | 8 ++++++++ sound/aoa/soundbus/i2sbus/core.c | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-)
sound/aoa/fabrics/layout.c +8 -0
@@ -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
@@ -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 ;
Signature · 6 lines
1.7.10.4 _______________________________________________ Linuxppc-dev mailing list [email protected] https://lists.ozlabs.org/listinfo/linuxppc-dev
At Wed, 15 May 2013 09:44:47 +1000,
Quoted 3 lines · Benjamin Herrenschmidt
[1 <text/plain (7bit)>]
Thanks, I applied the patch now to sound git tree.
Takashi
Quoted 77 lines
[2 Forwarded message — [PATCH] ALSA: snd-aoa: Add a layout entry for PowerBook6,5 <message/rfc822 (7bit)>]
To: <[email protected]>
Cc: [email protected]
Subject: [PATCH] ALSA: snd-aoa: Add a layout entry for PowerBook6,5
From: Michael Ellerman <[email protected]>
Delivered-To: [email protected]
Date: Mon, 6 May 2013 11:01:05 +1000
Message-Id: <[email protected]>
List-Unsubscribe: <https://lists.ozlabs.org/options/linuxppc-dev>, <mailto:[email protected]?subject=unsubscribe>
List-Archive: <http://lists.ozlabs.org/pipermail/linuxppc-dev/>
List-Post: <mailto:[email protected]>
List-Help: <mailto:[email protected]?subject=help>
List-Subscribe: <https://lists.ozlabs.org/listinfo/linuxppc-dev>, <mailto:[email protected]?subject=subscribe>
MIME-Version: 1.0
Content-Transfer-Encoding: 7bitEither one or a combination of commits 81e5d86 "Register i2c devices from device-tree" and 3a3dd01 "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 <[email protected]>--- sound/aoa/fabrics/layout.c | 8 ++++++++ sound/aoa/soundbus/i2sbus/core.c | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-)sound/aoa/fabrics/layout.c +8
-0@@ -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@@ -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 ;Signature · 6 lines
1.7.10.4 _______________________________________________ Linuxppc-dev mailing list [email protected] https://lists.ozlabs.org/listinfo/linuxppc-dev
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel