From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 83A02B6EE9 for ; Tue, 22 Feb 2011 09:21:03 +1100 (EST) Subject: Re: [PATCH] Add support for PowerMac3,5 in snd-aoa ALSA sound module From: Benjamin Herrenschmidt To: Takashi Iwai In-Reply-To: References: <201102202238.28517.linuxuser330250@gmx.net> Content-Type: text/plain; charset="UTF-8" Date: Tue, 22 Feb 2011 09:20:51 +1100 Message-ID: <1298326851.8833.75.camel@pasglop> Mime-Version: 1.0 Cc: Johannes Berg , linuxppc-dev@lists.ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Mon, 2011-02-21 at 09:37 +0100, Takashi Iwai wrote: > At Sun, 20 Feb 2011 22:38:28 +0100, > Linux User #330250 wrote: > > > > Hello again! > > > > Sorry for sending the patch three times. (This is the fourth...) > > > > About the sign-off: I use the name I've been using since I started > > participating. The document $LINUX/Documentation/SubmittingPatches clearly > > states that one has to use real names. I'm breaking this rule, but I'm not > > ready to reveal my real name here or at any other place at this time. Sorry. > > If this patch is not accepted due to this, well… that's life. BTW my real > > given name is Andreas. > > Well, we need really the full name for sign-off. > In general, it's not acceptable with the proper sign-off... So somebody else can just pick the "documentation" that layout ID 21 works just like 22 for us, and write an "acceptable" patch... Cheers, Ben. > > Takashi > > > > > > > > So, here's the patch, this time with a (pseudonym) sign-off: > > > > This patch makes the snd-aoa ALSA sound module support the TAS3001C codec of > > my Apple Power Mac G4 "Quicksilver" (2001 model). I suppose it will also work > > for the "Quicksilver 2002", since both identify as PowerMac3,5. > > > > The patch also changes a few comments to name the exact Power Mac model more > > accurately in sound/aoa/fabrics/layout.c. > > > > Signed-off-by: Andreas aka Linux User #330250 > > > > --- > > > > diff -Naur linux-2.6.38-rc5-git2/sound/aoa/fabrics/layout.c linux-2.6.38-rc5-git2-aoa-PowerMac3,5/sound/aoa/fabrics/layout.c > > --- linux-2.6.38-rc5-git2/sound/aoa/fabrics/layout.c 2011-01-05 01:50:19.000000000 +0100 > > +++ linux-2.6.38-rc5-git2-aoa-PowerMac3,5/sound/aoa/fabrics/layout.c 2011-02-17 18:43:26.000000000 +0100 > > @@ -111,6 +111,7 @@ > > MODULE_ALIAS("sound-layout-100"); > > > > MODULE_ALIAS("aoa-device-id-14"); > > +MODULE_ALIAS("aoa-device-id-21"); > > MODULE_ALIAS("aoa-device-id-22"); > > MODULE_ALIAS("aoa-device-id-35"); > > > > @@ -333,14 +334,14 @@ > > .connections = topaz_input, > > }, > > }, > > - /* Quad PowerMac (analog in, analog/digital out) */ > > + /* PowerMac11,2 (G5 Dual-Core and Quad) (analog in, analog/digital out) */ > > { .layout_id = 68, > > .codecs[0] = { > > .name = "onyx", > > .connections = onyx_connections_nomic, > > }, > > }, > > - /* Quad PowerMac (digital in) */ > > + /* PowerMac11,2 (G5 Dual-Core and Quad) (digital in) */ > > { .layout_id = 69, > > .codecs[0] = { > > .name = "topaz", > > @@ -521,14 +522,21 @@ > > .connections = onyx_connections_noheadphones, > > }, > > },--- > > - /* PowerMac3,4 */ > > + /* PowerMac3,4 (Digital Audio) */ > > { .device_id = 14, > > .codecs[0] = { > > .name = "tas", > > .connections = tas_connections_noline, > > }, > > }, > > - /* PowerMac3,6 */ > > + /* PowerMac3,5 (Quicksilver) */ > > + { .device_id = 21, > > + .codecs[0] = { > > + .name = "tas", > > + .connections = tas_connections_noline, > > + }, > > + }, > > + /* PowerMac3,6 (Mirrored Drive Doors) */ > > { .device_id = 22, > > .codecs[0] = { > > .name = "tas", > > diff -Naur linux-2.6.38-rc5-git2/sound/aoa/soundbus/i2sbus/core.c linux-2.6.38-rc5-git2-aoa-PowerMac3,5/sound/aoa/soundbus/i2sbus/core.c > > --- linux-2.6.38-rc5-git2/sound/aoa/soundbus/i2sbus/core.c 2011-01-05 01:50:19.000000000 +0100 > > +++ linux-2.6.38-rc5-git2-aoa-PowerMac3,5/sound/aoa/soundbus/i2sbus/core.c 2011-02-17 18:44:36.000000000 +0100 > > @@ -200,7 +200,7 @@ > > * 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 == 21 || *id == 14 || *id == 35)) { > > snprintf(dev->sound.modalias, 32, > > "aoa-device-id-%d", *id); > > ok = 1; > > > _______________________________________________ > Linuxppc-dev mailing list > Linuxppc-dev@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/linuxppc-dev