From patchwork Thu Mar 27 11:52:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Smith X-Patchwork-Id: 334331 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 487CC140298 for ; Fri, 28 Mar 2014 00:08:36 +1100 (EST) Received: from mail-wi0-x230.google.com (mail-wi0-x230.google.com [IPv6:2a00:1450:400c:c05::230]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6C91114016F for ; Thu, 27 Mar 2014 22:53:08 +1100 (EST) Received: by mail-wi0-f176.google.com with SMTP id r20so5864428wiv.15 for ; Thu, 27 Mar 2014 04:53:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-transfer-encoding; bh=e/WOLGGo1Q+LMqnK13J7xKuMFT9ehlj1rTKj1EUfcfw=; b=sisS6lPetDepok2iC61X0nZ3PsDJuPm758pmnlkF2qPy7D19QCg2i2xy74BW+ZeA7R M/Iyu5kJKOvPtRDFmQ/80Y1Qy/1anz//t/wa7kcjXKAQPLb2ZYPGLnQsHpthCy0WBWpS v43sZyoj/KSpgNJqzyyq2IXvezdrpHXhGdwRVJ2X/FYTRMY6X9c2YDYp/0dFKMQn83t2 aSPod1NrHXvRvie9sc86HySM0WUkNkiLHSu2XoINwLIZ3CcqgEdgki6rsYUz5+lSPIdU pjk5s5LuPNO1Ffnw2ys1Wc9PgTAAaiicjAr/iKHAL0gpXCzpzYNqqDnBVrusyfl94gTw 1mmw== X-Received: by 10.180.100.169 with SMTP id ez9mr39590089wib.15.1395921181155; Thu, 27 Mar 2014 04:53:01 -0700 (PDT) Received: from linuxmint (host-92-28-3-234.as13285.net. [92.28.3.234]) by mx.google.com with ESMTPSA id fs8sm11639712wib.8.2014.03.27.04.52.59 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 27 Mar 2014 04:53:00 -0700 (PDT) Date: Thu, 27 Mar 2014 11:52:58 +0000 From: Adam Smith To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH] ALSA: snd-aoa: Add another layout entry for PowerBook6,5 Message-Id: <20140327115258.40fecbd1439a5cd7769ab792@gmail.com> X-Mailer: Sylpheed 3.2.0beta5 (GTK+ 2.24.20; x86_64-pc-linux-gnu) Mime-Version: 1.0 X-Mailman-Approved-At: Fri, 28 Mar 2014 00:08:04 +1100 Cc: stefang@aon.at X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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 diff -uprN a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c --- a/sound/aoa/fabrics/layout.c 2014-01-20 02:40:07.000000000 +0000 +++ b/sound/aoa/fabrics/layout.c 2014-03-05 18:31:11.748445177 +0000 @@ -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", diff -uprN a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c --- a/sound/aoa/soundbus/i2sbus/core.c 2014-01-20 02:40:07.000000000 +0000 +++ b/sound/aoa/soundbus/i2sbus/core.c 2014-03-05 18:32:41.184445303 +0000 @@ -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;