Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp930827ybt; Wed, 17 Jun 2020 18:13:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyH0VW623FwJjbcfqlUslOofKLfqTMbGj5oMn1qPQibvjy3AcQirBpr/wOO5zwN91lihgLj X-Received: by 2002:a50:ce45:: with SMTP id k5mr1850910edj.80.1592442790760; Wed, 17 Jun 2020 18:13:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592442790; cv=none; d=google.com; s=arc-20160816; b=FWtTabyXEYhtP+UmTJlDUG0Wx9duV/g4gqtNETx6F5bXxR8zEKaUfZYSY/8CYJ0QZ7 Gu1xu6ZYyKx9IruJxTLeNFuD83EHO4D4e/dQ5onjuXKqPWpTRBBqbSsR0cMxY1tvOgud JyyMJkmbdSIA9OMpahECd1Ha10VEbPcwSKt4kgP59OdvF1QCBFZJA4uqA/m7LFhySU3W ii9YY/3tf6PcGL0pszjdxoDapMrC5egUVdORpI4C5LtsMfhhk65pZzSv8wjsHlY6rpii FwGA5sUzMa0xlc9BNYVdo8zzBnjne0aT4cmDTG9ZNJvXCX4DL76eBmrLZcI4Qegp4wrI IKMw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=p3vpMl3NGbz7+Vco6oQREO3o7zN3kth+lXc7DNBgqMM=; b=BReJsOdQYU9ad4LbTOgdZ0F5YTYkN/p1DwVIMTuuRP/7s0tL+Ba39iUMxSSKhiNXIW XjDJ6jsBnbkBIdMAe361UoxHK51xfhee+NwS9JoVJMArz1dKco437Wv9TXq7TdWiII4z u4ESXUr2LVHQ0BTuDC6Y9VEPepnbdNWRoU4ZgN2P9ctRJo43wMvkObKZLl9t6QTZdRQG GHi0u38/yXL3Vqk7GJT/RBWZ/2ISSHnZsEvZ51e6yIqocSB/cH1E5iM/0wzjfblxPexR 36YtUCEBM9L3+rYdiS61U1swa1IwNoz4gRQwVbjwjK0s0XIcthmWrGobsn2D2iZ6X/NL AJ5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=t5Zl3YYt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dv16si920896ejb.557.2020.06.17.18.12.47; Wed, 17 Jun 2020 18:13:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=t5Zl3YYt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727874AbgFRBIm (ORCPT + 99 others); Wed, 17 Jun 2020 21:08:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:34392 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727823AbgFRBIe (ORCPT ); Wed, 17 Jun 2020 21:08:34 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0E22221D7E; Thu, 18 Jun 2020 01:08:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442513; bh=mmt5ndiFij10gOStOvriPpqYvAFtLsVIaRIzJBlMHF8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t5Zl3YYtDAtqIg5Bp60iwr1hbdnPKb+bwg7S7LOuaR0s+WbQxhoCWosEX+xeQFcYq qAKg1OsG5zG/FicEoZFaVUjFGNC+CWMb9gpII5TtCnW/YyDe8Cv80eHRSx9rY64FIO jI/jBwyO6+PsPdcgAfuiwI62Ua2FMlE0lAB8a+qo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Arnd Bergmann , Charles Keepax , Mark Brown , Sasha Levin , alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.7 020/388] ASoC: codecs: wm97xx: fix ac97 dependency Date: Wed, 17 Jun 2020 21:01:57 -0400 Message-Id: <20200618010805.600873-20-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index e60e0b6a689c..8cdc68c141dc 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 -- 2.25.1