From patchwork Thu Sep 2 18:12:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Chancellor X-Patchwork-Id: 12472279 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21305C433EF for ; Thu, 2 Sep 2021 18:14:47 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CB5A6610A2 for ; Thu, 2 Sep 2021 18:14:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CB5A6610A2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 92D6817C2; Thu, 2 Sep 2021 20:13:53 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 92D6817C2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1630606483; bh=fgmXveWCM05mSbllKfAaxxlHFe2iMk5xtIxQopJphow=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=icmmrAFyFFm9z9nUYTfbDKVTWR9b0+fHBi20vVSFHtQci31dUYPQypXf7z7LVuBcC FzwXieoh04ibNVmclkDyE+BtC7q7N10JsRKdD514erLj/9nSVNFcq5/pGDyUzsXEUN rxYZ8yQ5otiQPk4zHi/SChi/nJkut8NBH3JjI19A= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 1CACDF8020D; Thu, 2 Sep 2021 20:13:53 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A0494F80269; Thu, 2 Sep 2021 20:13:51 +0200 (CEST) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 5C56BF8020D for ; Thu, 2 Sep 2021 20:13:43 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5C56BF8020D Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="l1PtFlT2" Received: by mail.kernel.org (Postfix) with ESMTPSA id 075FC6109E; Thu, 2 Sep 2021 18:13:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1630606420; bh=fgmXveWCM05mSbllKfAaxxlHFe2iMk5xtIxQopJphow=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l1PtFlT2H4GNdOvcM1dANKRnyhtzuXVeLC1RT+AVVdmZwN7szaUM1p6yCqj/yV5GO yrDAmt6nHda48xj5MaKQ//bSob8YAqRK5kChyMO+3EDgCzbaWrTYNBk1uNXYiknQKi b/Ue1LZG4gNOaLL8hI62aMopH4trFp1J0wjGPWwJQ0Pvq6Nj5H13mEGvHcQ8+arYXt JtdG8rPQ4OyNif2EXjktsFZmGabN9rbCVAj0goVsdDhRpKRumGh5FhwlPAhECQAiYD bT7AmyzHqJY56kNWCk2cG5BcNsRVqQtacgV9GMK1FuNL3JRGBzqbNY5/mPzPqvymH/ AeNBjoGWLvBbg== From: Nathan Chancellor To: Cezary Rojewski , Pierre-Louis Bossart , Liam Girdwood , Jie Yang , Mark Brown Subject: [PATCH for-5.15 v3] ASoC: Intel: boards: Fix CONFIG_SND_SOC_SDW_MOCKUP select Date: Thu, 2 Sep 2021 11:12:18 -0700 Message-Id: <20210902181217.2958966-1-nathan@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210802212409.3207648-1-nathan@kernel.org> References: <20210802212409.3207648-1-nathan@kernel.org> MIME-Version: 1.0 X-Patchwork-Bot: notify Cc: alsa-devel@alsa-project.org, Takashi Iwai , linux-kernel@vger.kernel.org, Fabio Aiuto , Nathan Chancellor X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" When CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is enabled without CONFIG_EXPERT, there is a Kconfig warning about unmet dependencies: WARNING: unmet direct dependencies detected for SND_SOC_SDW_MOCKUP Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && EXPERT [=n] && SOUNDWIRE [=y] Selected by [y]: - SND_SOC_INTEL_SOUNDWIRE_SOF_MACH [=y] && ... Selecting a symbol does not account for dependencies. There are three ways to resolve this: 1. Make CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH select CONFIG_SND_SOC_SDW_MOCKUP only if CONFIG_EXPERT is set. 2. Make CONFIG_SND_SOC_SDW_MOCKUP's prompt depend on CONFIG_EXPERT so that it can be selected by options that only depend on CONFIG_SOUNDWIRE but still appear as a prompt to the user when CONFIG_EXPERT is set. 3. Make CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH imply CONFIG_SND_SOC_SDW_MOCKUP, which will select CONFIG_SND_SOC_SDW_MOCKUP when its dependencies are enabled but still allow the user to disable it. Go with the third option as it gives the most flexibility while retaining the original intent of the select. Fixes: 0ccac3bcf356 ("ASoC: Intel: boards: sof_sdw: add SoundWire mockup codecs for tests") Suggested-by: Pierre-Louis Bossart Acked-by: Pierre-Louis Bossart Signed-off-by: Nathan Chancellor --- v2 -> v3: * Rebase on current for-5.15. * Add Ack tag from Pierre-Louis. v1 -> v2: * Switch to imply rather than select ... if ... (Pierre-Louis). * Reword commit message to explain different solutions rather than explain the problem in depth. sound/soc/intel/boards/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 4f89ff026ddbaab49dba993ad2dc757920d0ad49 diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig index 046955bf717c..61b71d6c44cf 100644 --- a/sound/soc/intel/boards/Kconfig +++ b/sound/soc/intel/boards/Kconfig @@ -602,7 +602,7 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH select SND_SOC_DMIC select SND_SOC_INTEL_HDA_DSP_COMMON select SND_SOC_INTEL_SOF_MAXIM_COMMON - select SND_SOC_SDW_MOCKUP + imply SND_SOC_SDW_MOCKUP help Add support for Intel SoundWire-based platforms connected to MAX98373, RT700, RT711, RT1308 and RT715