From patchwork Tue Nov 6 18:07:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 150326 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4201941ljp; Tue, 6 Nov 2018 10:07:13 -0800 (PST) X-Google-Smtp-Source: AJdET5f1kiEOqZ27QcWMl0iQh1+TqZ5H0pb8VAoXQLvJ2M75/ukhHIU3vnTZvPdoV6cQCVmeRA0B X-Received: by 2002:a5d:69ce:: with SMTP id s14-v6mr25488102wrw.177.1541527633875; Tue, 06 Nov 2018 10:07:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541527633; cv=none; d=google.com; s=arc-20160816; b=qjtY5AqHWQVmXv6j2Y/21Fu3Bp5o7Vir+Cst/vscjQ8Xqj4+OSxhUvG//UNONko8Ns 3U4Xxu727guIVM1F9dodRYq2HfOj1cccfGy9p6LSYYMKZbw/cpaeqp/AoK87yF/PpmRi FpYMPloxSfy82GDmBaUs+GAxi7r8GGhCy6EBPwbocEdJsNDDJ/DXeD8ZdEPKL6T+jffE 8i4wH1mkmg1N94ldIzjJUXh6Ep8J2mx+vVpOuo9we3UjHb53VZ49gJeWRuP7CYsYtMsR 0YYnp3G7rfSeLcw4xhUGB9JKH7RQbTtHwcrOn6qsBaqqmBO2mhYI704eBS0jrMSY72HD pX+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to; bh=koAi/huHuoBIkmeLTnSmt1mzUt52bYAYnFarQTOv/so=; b=0oI2rn45xH2LZcBFEA16cKSZivOfQS4ghICiFwGW1W7N5Qttp3X8pn5HCWqiYehqT4 4zEooPhPcDFHnlYqDB5wHrf2ev7uigeJvj6gdX9x2NvuL1kk/b2ID2H2j0Qee4P/DRW+ rQ/Aq6NsO9k+zSxNoapdyt82GxhLiorcfdBQlrhKGSOu79yFoYjTRKseCF6KSqIPCYB0 g6Mgbmre4SJLtHx984x1Zljj3pC1gdS9dLG8j1nAgshgfmprTihkcg075SVC5bDq33EV 3H0FpD+7tAUYVsdneOQT+/Fn4KBxa9ozYKOTtUvJuphef8IbzuMWnILM3YnnEY9CZ4yN dxew== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=h9FHmmkt; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id g2-v6si2077867wma.153.2018.11.06.10.07.13; Tue, 06 Nov 2018 10:07:13 -0800 (PST) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=h9FHmmkt; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id A48DE267ACF; Tue, 6 Nov 2018 19:07:12 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 4A92C267AD1; Tue, 6 Nov 2018 19:07:10 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 9AF54267AD1 for ; Tue, 6 Nov 2018 19:07:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=6O/deAk4jJNmRmPS+rQRrqHK4SkvnARVbYgcQcNEEUg=; b=h9FHmmktxXun U+yjFlnWxAZkq+9ZT1hEjcvy2hWv4lk5ofQWrGBnqLrh39tJ5a7iavXJBVPBeFp6Sp8dyVaDAh30Z SSNZyUtjTf6+3/KdnJNKU4BQ6lMQc2CEHbQGDJNrMjD3IZ4La0GjoMXmNnKyDSx8oqSzIaGpjHFX8 E0V0M=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1gK5kn-0002tf-MN; Tue, 06 Nov 2018 18:07:05 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 6580A112266B; Tue, 6 Nov 2018 18:07:05 +0000 (GMT) From: Mark Brown To: Arnd Bergmann In-Reply-To: <20181102112055.659197-1-arnd@arndb.de> Message-Id: <20181106180705.6580A112266B@debutante.sirena.org.uk> Date: Tue, 6 Nov 2018 18:07:05 +0000 (GMT) Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Takashi Iwai , Haojian Zhuang , Liam Girdwood , Mark Brown , Daniel Mack , Robert Jarzmik , linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] Applied "ASoC: pxa: change ac97 dependencies" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: pxa: change ac97 dependencies has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 25540f68c871d0ed3771b552eb640a1130880ab6 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Fri, 2 Nov 2018 12:20:39 +0100 Subject: [PATCH] ASoC: pxa: change ac97 dependencies Enabling both the old AC97_BUS code and the new AC97_BUS_COMPAT causes problems because both modules provide an exported snd_ac97_reset() function. I had tried to fix the problem of having both coexist earlier, but my patch only prevented them from being built-in. This is because of a special Kconfig feature that lets a symbol have a dependency on another one being disabled, but still allow both to be loadable modules. Changing the dependency to =n avoids that problem, now we can only build the new driver if the old one is completely disabled. If we could figure out a way to let rename one of the reset functions and have each driver link to exactly the old or the compat code, that would also work, but I could not find if that's possible. Fixes: bec5ecdf41d4 ("ASoC: pxa: avoid AC97_BUS build warning") Signed-off-by: Arnd Bergmann Signed-off-by: Mark Brown --- sound/soc/pxa/Kconfig | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -- 2.19.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index 943b44de1464..6075fc32e6b9 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig @@ -79,7 +79,7 @@ config SND_PXA2XX_SOC_TOSA tristate "SoC AC97 Audio support for Tosa" depends on SND_PXA2XX_SOC && MACH_TOSA depends on MFD_TC6393XB - depends on !AC97_BUS + depends on AC97_BUS=n select SND_PXA2XX_SOC_AC97 select SND_SOC_WM9712 help @@ -89,7 +89,7 @@ config SND_PXA2XX_SOC_TOSA config SND_PXA2XX_SOC_E740 tristate "SoC AC97 Audio support for e740" depends on SND_PXA2XX_SOC && MACH_E740 - depends on !AC97_BUS + depends on AC97_BUS=n select SND_SOC_WM9705 select SND_PXA2XX_SOC_AC97 help @@ -99,7 +99,7 @@ config SND_PXA2XX_SOC_E740 config SND_PXA2XX_SOC_E750 tristate "SoC AC97 Audio support for e750" depends on SND_PXA2XX_SOC && MACH_E750 - depends on !AC97_BUS + depends on AC97_BUS=n select SND_SOC_WM9705 select SND_PXA2XX_SOC_AC97 help @@ -109,7 +109,7 @@ config SND_PXA2XX_SOC_E750 config SND_PXA2XX_SOC_E800 tristate "SoC AC97 Audio support for e800" depends on SND_PXA2XX_SOC && MACH_E800 - depends on !AC97_BUS + depends on AC97_BUS=n select SND_SOC_WM9712 select SND_PXA2XX_SOC_AC97 help @@ -120,7 +120,7 @@ config SND_PXA2XX_SOC_EM_X270 tristate "SoC Audio support for CompuLab EM-x270, eXeda and CM-X300" depends on SND_PXA2XX_SOC && (MACH_EM_X270 || MACH_EXEDA || \ MACH_CM_X300) - depends on !AC97_BUS + depends on AC97_BUS=n select SND_PXA2XX_SOC_AC97 select SND_SOC_WM9712 help @@ -131,7 +131,7 @@ config SND_PXA2XX_SOC_PALM27X bool "SoC Audio support for Palm T|X, T5, E2 and LifeDrive" depends on SND_PXA2XX_SOC && (MACH_PALMLD || MACH_PALMTX || \ MACH_PALMT5 || MACH_PALMTE2) - depends on !AC97_BUS + depends on AC97_BUS=n select SND_PXA2XX_SOC_AC97 select SND_SOC_WM9712 help @@ -161,7 +161,7 @@ config SND_SOC_TTC_DKB config SND_SOC_ZYLONITE tristate "SoC Audio support for Marvell Zylonite" depends on SND_PXA2XX_SOC && MACH_ZYLONITE - depends on !AC97_BUS + depends on AC97_BUS=n select SND_PXA2XX_SOC_AC97 select SND_PXA_SOC_SSP select SND_SOC_WM9713 @@ -201,7 +201,7 @@ config SND_PXA2XX_SOC_MAGICIAN config SND_PXA2XX_SOC_MIOA701 tristate "SoC Audio support for MIO A701" depends on SND_PXA2XX_SOC && MACH_MIOA701 - depends on !AC97_BUS + depends on AC97_BUS=n select SND_PXA2XX_SOC_AC97 select SND_SOC_WM9713 help