From patchwork Tue Apr 28 21:46:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 192852 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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 A55CEC83004 for ; Tue, 28 Apr 2020 21:48:08 +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 32B562072A for ; Tue, 28 Apr 2020 21:48:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="g9DB1zgM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 32B562072A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arndb.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@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 92BE81676; Tue, 28 Apr 2020 23:47:16 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 92BE81676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1588110486; bh=wZnqPgFYjX9/OiIm4wWXNu7iK0FURWhNzdNytdnEINc=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=g9DB1zgMborxuFf9/+SONxFg9Smy75OI2DKwG2CqyJ/d31eTP9ZEV5xa6czZ3MFCo 1yNoUausbyf/qaBzTtTn5RL8irJwVEdRRU9G8s3kKhdqdA7+gnuIEIFPf9aAYzrArj VycarE8Hkhbmtujw84cjFPXAOLnLqA4Zc+TZsUbQ= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 17AFCF80136; Tue, 28 Apr 2020 23:47:16 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B7882F801DB; Tue, 28 Apr 2020 23:47:14 +0200 (CEST) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id F2C33F800B8 for ; Tue, 28 Apr 2020 23:47:08 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz F2C33F800B8 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.129]) with ESMTPA (Nemesis) id 1MNbtD-1joGmV3G95-00P4Gf; Tue, 28 Apr 2020 23:46:44 +0200 From: Arnd Bergmann To: Mark Brown , Pierre-Louis Bossart Subject: [PATCH] ASoC: rt5682: fix I2C/Soundwire dependencies Date: Tue, 28 Apr 2020 23:46:14 +0200 Message-Id: <20200428214642.3925004-1-arnd@arndb.de> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:LjpCd0o0srZhlkXmKTYqi2kzkFjj8wOMi3UgGvZfhHwihrM2ZVK po+jmWaIRXwaEFPAix4bogG21pyYWTA+mjs+9fJP7UQkVRxcH099TCrSRRrDi2zbSW3q6fH aBP1db4kBRs2/IQtjmZPXOXXW9bJN+qqAuialfeXrl4bYwkfWYhxGD6X5GE7NBtKxHJhoNw YBnj+zR/OD1wyM18k0xUw== X-UI-Out-Filterresults: notjunk:1; V03:K0:RitVMxCvchg=:YzXMmPSbKEkthW6/6Sna2e ZlsFFGHLJK4HZl3QB1eIBSH8IeLm8qrCcWVzORws3LRh5HlqqvGV3diOIzbAqZZvbxKh3UTFs 8sqwWDDc/3bM7bVE+a+ZCbcw9++h8gCMGTgT1iALxNHyWDeJ2/Ml3n3HjgcOR1wD7Ro86caLK nEtjixxhsg9Obg1J1nZWGQPS7Tn9Y5SEqx+GO9fVI2wx/7J+IyxGHHhp7dqiNcL4x6bAgMGvi /JqFgtH+95MLmql7ZPOx9GGr6rnBqkDPTK5pu1b3NakZlZxR9i2+NMoGqmtPOF1WlHDWxqsIq 62GecHr+rlX4Tcx2ctIAmzDwNU4NBZwJIdydD0dhWFj2oOuS1/IKh2XtyUrtvWwdgVN8Vf2cX paaV9kZr05A2bqLZGItOAs3S8B2S7UhR+aAmIglTS12UNWaTMyoKCd+4vKt0kPkpnqT1gMsHN p34QR84rPgwRCYBVb44IBw7WYEICnbZiarylnlvnxZ2tVLYXFw9HNaz61ueSLd/OxI41iQcoI m4iOb35E3lYa52qUrEw0RCQdh70bx0GzTfDBkNiluMvCVhi3BTnQ81ZBEXrb6DHZl7DhjCnU9 mGpj6KcYoFJCE8YB3jJOPGaPfRiQhKMankcbVZQ3QDndTxrh5NcMB5A2V+QfVKx062LJk3L2C 5A7a+4B4VqQVq+pjlxkH5i2vpZ/JXNgTUEVtKNdgMj3KtO90IYcWb5ZqdPC4MTewD1h6LP0nk e0HEQjGDKiUQeXIMLMPZdwY3HeSk6qRMRthY3ZbKlDpaGjrDW4AhWTtHIcL4g+x0mLZ+pDPg+ JS0+NZRbUTcXnhbtb5gKwEuejrM02qPu79NAwQ4szosU+S4FMk= Cc: Oder Chiou , alsa-devel@alsa-project.org, Charles Keepax , kbuild test robot , Arnd Bergmann , Liam Girdwood , linux-kernel@vger.kernel.org, Takashi Iwai , Geert Uytterhoeven , Richard Fitzgerald 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" If one of the two is a loadable module, the combined driver must not be built-in: aarch64-linux-ld: sound/soc/codecs/rt5682.o: in function `rt5682_sdw_hw_free': rt5682.c:(.text+0xb34): undefined reference to `sdw_stream_remove_slave' aarch64-linux-ld: sound/soc/codecs/rt5682.o: in function `rt5682_sdw_hw_params': rt5682.c:(.text+0xe78): undefined reference to `sdw_stream_add_slave' In particular, the soundwire driver must not be built-in if CONFIG_I2C=m. Fixes: 5549ea647997 ("ASoC: rt5682: fix unmet dependencies") Signed-off-by: Arnd Bergmann --- sound/soc/codecs/Kconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 1ce76f04c154..d911956c591d 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -1137,10 +1137,13 @@ config SND_SOC_RT5677_SPI config SND_SOC_RT5682 tristate depends on I2C || SOUNDWIRE + depends on SOUNDWIRE || !SOUNDWIRE + depends on I2C || !I2C config SND_SOC_RT5682_SDW tristate "Realtek RT5682 Codec - SDW" depends on SOUNDWIRE + depends on I2C || !I2C select SND_SOC_RT5682 select REGMAP_SOUNDWIRE