From patchwork Tue Jun 23 19:50:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 191629 Delivered-To: patch@linaro.org Received: by 2002:a54:3249:0:0:0:0:0 with SMTP id g9csp1378011ecs; Tue, 23 Jun 2020 14:45:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzveyytso50pXaMuNfUm/nlWcoadwLLN59QmQwBXCf7/kIbPgLvGZVcNEUbUQPXK0Qe2myt X-Received: by 2002:a17:906:2b50:: with SMTP id b16mr10845249ejg.410.1592948712555; Tue, 23 Jun 2020 14:45:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592948712; cv=none; d=google.com; s=arc-20160816; b=X2a/KrCIJbLXq0WOOKfLiFl4VsuiDUSv3C35oIZOUDvry5BhvmV4f7OJ1c7b8ZwPEp qrwq2t4K4kSPdRLMq/Tcwk6Iy2y0jnYCMgqykgnHvHMw2ZghkDH+pvMjqjUiV9mCa5bR 8douR+ZylsKdgDRChJtuo731lpPWb9Fp+yy97hgeoloKrGhfDtpnpka7HVQuLmkFHG6t kpmVhDUNJqo6/meRvx7epVTUqLgijN0lD14Fdw0P1PIlu73/gE1erNyeAtaKpcdBI5Q+ HjN+l8XlisFzw6Cw4eSeC8RwxmhbaWOYLZ2LP2uk+d5cSAHsD2myCtPCULnIyeTnM7rZ oz4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tNzMEzdeNzNRjxr9t7dddKIDldP4Jb3iwC6B1WOHWZU=; b=gnMp4LZbi6wDerjwjjXlDYqVbi3bd0gDNDjQotbwtRlSQpghQGoxZsETXnwuJHt8Uh uqh7Z7oUMwqGgnkGyrXBWlZfUYbrJjv43YRmOb8RApszpkWQCwO5lDjX8gYvj1yNmIlR I/xBYCeaDQaLdfUBZ8X2gEjrDVUzYbYsgaZTMuorMOYzlWcpsoFNkSh51sWya1YvfBNC kmO6NJgkgQb5dtaRPUsVDSKhupw/iHJe+RWS3A3+zP7rWebHtg/e3n0XGIunwU3S872E hgIpfhQIdSZkjosOIB9wJeQuRockjwtEMtOwA6aWxH34CF/3nja3CY03gKWnsak7kmcC bFdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tOZSEcX4; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ss22si5375022ejb.530.2020.06.23.14.45.12; Tue, 23 Jun 2020 14:45:12 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tOZSEcX4; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387514AbgFWUBd (ORCPT + 15 others); Tue, 23 Jun 2020 16:01:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:38104 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387659AbgFWUBa (ORCPT ); Tue, 23 Jun 2020 16:01:30 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 86CBB20E65; Tue, 23 Jun 2020 20:01:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942489; bh=NPhdMSexgXVr2CMyXgOIkLzPcvA1wkS4We3dSQZTImo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tOZSEcX4KXrUSc4B1QdbIl+EOT0kDbAejqdZfsJNLDZFDf65KH7nRLzjiHf83r+tU fEfeq2/E7QFjEnACEJFCpAJJzW3mX0yn2rBTZXyJRRHHHwlXdEzVnygLjZLC6Q/nge U/Zuiiyt2U8cbyMwRnPX0o90qY/kKjVzmQmrvcKY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Charles Keepax , Mark Brown , Sasha Levin Subject: [PATCH 5.7 019/477] ASoC: codecs: wm97xx: fix ac97 dependency Date: Tue, 23 Jun 2020 21:50:16 +0200 Message-Id: <20200623195408.514096798@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit ee2cbe06935bfa58f1fe07dc2a2283945f4b97dc ] A recent build fix got the dependency slightly wrong, breaking builds with CONFIG_AC97_BUS_NEW: WARNING: unmet direct dependencies detected for SND_SOC_WM9713 Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_AC97_BUS [=n] Selected by [m]: - SND_SOC_ZYLONITE [=m] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_PXA2XX_SOC [=m] && MACH_ZYLONITE [=y] && AC97_BUS [=n]=n WARNING: unmet direct dependencies detected for SND_SOC_WM9712 Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_AC97_BUS [=n] Selected by [m]: - SND_PXA2XX_SOC_EM_X270 [=m] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_PXA2XX_SOC [=m] && (MACH_EM_X270 [=n] || MACH_EXEDA [=n] || MACH_CM_X300 [=y]) && AC97_BUS [=n]=n Change the dependency to allow either version of the AC97 library code. Fixes: 5a309875787d ("ASoC: Fix SND_SOC_ALL_CODECS imply ac97 fallout") Signed-off-by: Arnd Bergmann Acked-by: Charles Keepax Link: https://lore.kernel.org/r/20200428212721.2877627-1-arnd@arndb.de Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.25.1 diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index e60e0b6a689cd..8cdc68c141dc2 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -1620,19 +1620,19 @@ config SND_SOC_WM9090 config SND_SOC_WM9705 tristate - depends on SND_SOC_AC97_BUS + depends on SND_SOC_AC97_BUS || AC97_BUS_NEW select REGMAP_AC97 select AC97_BUS_COMPAT if AC97_BUS_NEW config SND_SOC_WM9712 tristate - depends on SND_SOC_AC97_BUS + depends on SND_SOC_AC97_BUS || AC97_BUS_NEW select REGMAP_AC97 select AC97_BUS_COMPAT if AC97_BUS_NEW config SND_SOC_WM9713 tristate - depends on SND_SOC_AC97_BUS + depends on SND_SOC_AC97_BUS || AC97_BUS_NEW select REGMAP_AC97 select AC97_BUS_COMPAT if AC97_BUS_NEW