From patchwork Thu Sep 27 22:39:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 147749 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp6321lji; Thu, 27 Sep 2018 15:39:59 -0700 (PDT) X-Google-Smtp-Source: ACcGV61kGiiJcyVWTNeyBCVjKro5xnrPyKFEVCeqNHN3q58mbqfqcRnVc2eANVE6vGfXC4zdv96M X-Received: by 2002:adf:ce0e:: with SMTP id p14-v6mr10759709wrn.118.1538087999584; Thu, 27 Sep 2018 15:39:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538087999; cv=none; d=google.com; s=arc-20160816; b=AVZ+CfGJfANEC5yNCOt+UbS4K/Hvq2R9g1WB8AC0rEXW/iPLsw5hIQus32WHkU+kQm AEzJx8flVcG8RXnLyATLR92jSzkMgNSJyQpGmV2+mupdUkK5RmEKKByX7hVYSCOrGaaa +xjoMPOx06hwet6RVxu4WMIX9NJDpkMEC0dvFwDYyY9wsJRuYVnOUF34Pg2UoEDNhiUc LoBpUazARilf0mcKqxEiPLYCwfSY9LYSg6OkH2c63TJkShjMMzzWwE2fdGg+YHlpeKiG 9VGOnJa4lIlyxb+Lt/6WbEZ5koouYlDzp6OSh0HOXbHl32pcgAlDfiVaedwxjJfn6CLk MM0w== 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=szCFYS2Lo5+6jXPpJ89vGrBo+C7HqrFCjnhwmzHxE3E=; b=rWqaLQ7UP0PYYBKPOH1z1sqvJ0Qbn5kyiKJzpW5hfUAJZV2CCyCGjiRXtkpdfY09cG TbL7R2PxQyDKJLt3KNwUSsh1HHDCV/Hc4oXP64z4szD6TB2OvTV1FZU9fsSpRO8vdxPQ u9YcRz2KSF4n6Rs6QBQwabujTXkqlrkYnqsjnQsDcnpDTXTu5ZBD5gIQ1HRz5AoeRlFc ZlJkhSPlAiB4o4PciEPlzMTPMDEkndWLdcaHwfck5gqAoqYc6MhVMGUP1+CrXM5oBUht 2d2gytIo0oL1W45NfGkxJhKXFEerirtApLoi2jxwu/HdfgSKDzYee33h02UXvwh5ziqO yI8A== 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=IJ0w9qv7; 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 123-v6si276375wmm.15.2018.09.27.15.39.59; Thu, 27 Sep 2018 15:39:59 -0700 (PDT) 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=IJ0w9qv7; 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 2A97C2678DF; Fri, 28 Sep 2018 00:39:55 +0200 (CEST) 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 4113F2678DD; Fri, 28 Sep 2018 00:39:52 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 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 959522678CD for ; Fri, 28 Sep 2018 00:39:50 +0200 (CEST) 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=azex28AmX/O0gTkcDfuaJrjZcLt5qq8dSz/KSRFvBMg=; b=IJ0w9qv7BS5L Ktt3x5Aj5wIIqoTPvL6eNSojGyFEnJhZ72DDllus3schO/FaY69ThPJnzZcbGocjwDqNe1WIWD4h9 jOCharZeOkWmzN7xTZf9CH4nNaL0D57kj+LU+f5pdmgWZIBPAysQMyvGn5jLVsjQyd2cbqc3/aqkk CFjU4=; Received: from [2001:470:1f1d:6b5:7e7a:91ff:fede:4a45] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1g5ewm-0007TO-Pb; Thu, 27 Sep 2018 22:39:48 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 526C8440078; Thu, 27 Sep 2018 23:39:48 +0100 (BST) From: Mark Brown To: Arnd Bergmann In-Reply-To: <20180926124645.1841850-1-arnd@arndb.de> Message-Id: <20180927223948.526C8440078@finisterre.ee.mobilebroadband> Date: Thu, 27 Sep 2018 23:39:48 +0100 (BST) Cc: alsa-devel@alsa-project.org, Takashi Iwai , Liam Girdwood , Haojian Zhuang , linux-kernel@vger.kernel.org, Mark Brown , Geert Uytterhoeven , Daniel Mack , Robert Jarzmik , linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] Applied "ASoC: pxa: avoid AC97_BUS build warning" 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: avoid AC97_BUS build warning 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 bec5ecdf41d404691980c9c82ba867113cc8dee5 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Wed, 26 Sep 2018 14:46:35 +0200 Subject: [PATCH] ASoC: pxa: avoid AC97_BUS build warning Selecting AC97_BUS_NEW from SND_PXA2XX_SOC_AC97 leads to a Kconfig warning if any other driver selects AC97_BUS: WARNING: unmet direct dependencies detected for AC97_BUS_COMPAT Depends on [n]: SOUND [=y] && !UML && SND [=y] && AC97_BUS_NEW [=y] && !AC97_BUS [=y] Selected by [y]: - SND_SOC_WM9713 [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && AC97_BUS_NEW [=y] I don't know if that combination is supposed to work. Assuming it is not, this adds a dependency on all users for PXA to avoids the combination. Fixes: 1c8bc7b3de5e ("ASoC: pxa: switch to new ac97 bus support") Signed-off-by: Arnd Bergmann Signed-off-by: Mark Brown --- sound/soc/pxa/Kconfig | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.19.0 _______________________________________________ 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 29f577e6dfc0..943b44de1464 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig @@ -79,6 +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 select SND_PXA2XX_SOC_AC97 select SND_SOC_WM9712 help @@ -88,6 +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 select SND_SOC_WM9705 select SND_PXA2XX_SOC_AC97 help @@ -97,6 +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 select SND_SOC_WM9705 select SND_PXA2XX_SOC_AC97 help @@ -106,6 +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 select SND_SOC_WM9712 select SND_PXA2XX_SOC_AC97 help @@ -116,6 +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 select SND_PXA2XX_SOC_AC97 select SND_SOC_WM9712 help @@ -126,6 +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 select SND_PXA2XX_SOC_AC97 select SND_SOC_WM9712 help @@ -155,6 +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 select SND_PXA2XX_SOC_AC97 select SND_PXA_SOC_SSP select SND_SOC_WM9713 @@ -194,6 +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 select SND_PXA2XX_SOC_AC97 select SND_SOC_WM9713 help