Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp931821ybt; Wed, 17 Jun 2020 18:14:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwBuZ4C4kzb8fvxML7LMWSImjY+ZzVbuu3OW7ccadiiKnxdRu2dR2aCp7CMh2I9EzN1xO9l X-Received: by 2002:a17:907:9d3:: with SMTP id bx19mr1646497ejc.461.1592442895953; Wed, 17 Jun 2020 18:14:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592442895; cv=none; d=google.com; s=arc-20160816; b=OHkq5/Jmmc149p8eKNmtb/2SUYp/1NLQwQnoJAbfNO3r1uUtvA9Ln4aJ/GSmSD8Y5n 6YOgb8wVxkVl9gvbPlYBi5bpRDl8n+5t/omiI7oMNDLNv13BN7Q/qPFseGdGSwLWp5XM Bja9AcmBvBx0jLlTr8TtFmHr36R5wbWamtXuZYk3gTdGwr8pBMTU8dYkLzRCUZnNOaSt WurBlvWivNN+R3c9wJtyTy02P95aBIK0JoehvThftI8lClVjsHWSWnd5e6goay+ApwlN 7Vslu6YMHfX5ioBL1WXew7lm6aFqda5Hpy7hp3AX/4wsBT/WMRNfYv703NarzCNrG288 rCiw== 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=7SDxFVAb/peZtdJ+qSXl7md+IZMSWJLmikI+THI+Hpg=; b=GUELJttsXUARDowjg6mSkIZqJZdMPaWYhBztotj5Lfz7WfGwC3kI0SW+bBX0ECBSlA XbiZ6cT9D6VZmoW4GYg3meMRnOSj0gXIxH8dfeKMeUo6xa12PZtBVqHo9VIW/5C6hYE2 qSoq+suVRAXqwog5EOT/4kz59SSxvEqoVF5rQwuwmNpjv2jv0NNSoGxSyzPc32KoNOOn IJe7Hfkr2Id/5Bljm5fnCr8vMIXNOzTCOiVYRfTYh38RVqIlMIIjnCaD94lCPa6Pddxp jPqIfadXWjTtUOsFysoTyXYo6t6qK5wroI7apAXdM/Y96txZsByVIspJe+zy7UlMDMzy hpww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KESwxvfT; 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 e9si868362eja.348.2020.06.17.18.14.33; Wed, 17 Jun 2020 18:14:55 -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=KESwxvfT; 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 S1728121AbgFRBML (ORCPT + 99 others); Wed, 17 Jun 2020 21:12:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:39494 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728741AbgFRBLc (ORCPT ); Wed, 17 Jun 2020 21:11:32 -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 A19D820B1F; Thu, 18 Jun 2020 01:11:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442692; bh=ZYAJ00KFqyy/tvH5dMqM3Tjkm+Yhg3s3YaLpmyGJbto=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KESwxvfTZmm/vtKve9biDYZHrYPEdeqPRLfwTyMRdNzG1VffTo2UX8BfKyjHsA6MA HqbR2AadqymL8kvSEwIw2FWRAL5oaRqCMgVdf8vMPk4g331BQO9MAmFu9UeOB+je8z ac1scu7ZBnwWME1yqLaTPe/TpWjP1mhooWTeGXYo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Arnd Bergmann , Mark Brown , Sasha Levin , alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.7 157/388] ASoC: rt5682: fix I2C/Soundwire dependencies Date: Wed, 17 Jun 2020 21:04:14 -0400 Message-Id: <20200618010805.600873-157-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 fd443a20c2f0950f3c31765a08f7dd49b3bc69cb ] 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 Link: https://lore.kernel.org/r/20200428214642.3925004-1-arnd@arndb.de Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/Kconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 7d2cbed55a9d..4c643d2e6d6b 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -1136,10 +1136,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 -- 2.25.1