From patchwork Thu Feb 17 20:17:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Linux User #330250 X-Patchwork-Id: 83483 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 3EA71B73B6 for ; Fri, 18 Feb 2011 07:17:39 +1100 (EST) Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.23]) by ozlabs.org (Postfix) with SMTP id 56EE5B70F4 for ; Fri, 18 Feb 2011 07:17:28 +1100 (EST) Received: (qmail invoked by alias); 17 Feb 2011 20:17:23 -0000 Received: from 91-114-178-110.adsl.highway.telekom.at (EHLO hexablack.localnet) [91.114.178.110] by mail.gmx.net (mp025) with SMTP; 17 Feb 2011 21:17:23 +0100 X-Authenticated: #31574488 X-Provags-ID: V01U2FsdGVkX19diHhbjkBdKBKypnPO6aHnwoFu0gH4DKrm/pSlkU agJNvvKD43F7zH From: "Linux User #330250" To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH] Add support for PowerMac3,5 in snd-aoa ALSA sound module Date: Thu, 17 Feb 2011 21:17:24 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.37-gentoo-4; KDE/4.4.5; x86_64; ; ) MIME-Version: 1.0 Message-Id: <201102172117.25424.linuxuser330250@gmx.net> X-Y-GMX-Trusted: 0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Hello! About two years ago Johannes Berg wrote support for the PowerMac3,6 aka G4 MDD which I was using as a desktop computer then. Johannes wrote all the code, and I tested it. I now have a PowerMac3,5 – yes, an earlier model. 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. This is my first contribution to the linux kernel ever, so I hope you will be kind to me. I am not a programmer, but adding already supported devices was a task even I could accomplish. Thanks, 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;