From patchwork Tue Jun 23 19:52:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 191619 Delivered-To: patch@linaro.org Received: by 2002:a54:3249:0:0:0:0:0 with SMTP id g9csp1375150ecs; Tue, 23 Jun 2020 14:39:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJySiEqTkTz5HW3Zutna6a1k9/GAXS3f6OXL/o9bPJEaK+GWFdFY3SXtTO9R3qhdDRRa/FMJ X-Received: by 2002:a17:906:3b44:: with SMTP id h4mr22502766ejf.463.1592948365828; Tue, 23 Jun 2020 14:39:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592948365; cv=none; d=google.com; s=arc-20160816; b=Iv2jW5XhFptbBc7JkP3oZokUY0Q52W19zPz83AyIUcWlwiizGF2j0jBelR5rDkh3F3 TJ5SEbfgM2FEl9S/IgwsFHeh8XBHnXMjg2vjjzglUCMmKGqlPkwwgxp6EP+p79/qc3X4 52r1Z16uCEKvmkHNz3VpDq+3iBAQsNQQom4L2Ga4BllqTIRRRTXVrF9lXr4hszTiAKiP MsiMG05M49ibaJYe0uMAhWfvHYmcuNICkXyyy5GflTIDINp9uXoUns4+rHHNYr4CqC/S k7cscsXDFJ4V8+oKivpRy2AJDCn+Emt7qSgnJRk9DbV0J21KD5tc2KO3qKMAV6ds4Cza Nc/w== 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=BsYFoK8RnBgGfp7Ro8Dda+4rHFaoP6WHlKfJ8lfSbCY=; b=xVHn9LNen0cP593PJeVJToiMC/BCV6BWhi+MxW2A33M/UDG3UQfvUUHHJWrrTfF4ix 2dbbZPTqNKvC7Bqv8/2RkWbyRslyC1a72L80UGM6kzK6Lmi/WntPPLQVlGZER61jSLyB VBn6rghpvj9GjRCjW92AZqkTJmQZIyQMe0Ukk3kthflG317AabVsOAWq7z1ErQOW6fJC IczJNMxnxXuc+KDR2JXN90jeoQ6yvh0aZurFNqIqwQ/nhYOQ4dxp6WDuUFToH96wWrVt rthX0HqC8vQ3FW780lcS7zZWgGzTeG2sN45gXaOLJFTlUoyNQfxfxgUEt9HncNENmMx6 EEEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hbThSYyq; 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 jp23si1355445ejb.5.2020.06.23.14.39.25; Tue, 23 Jun 2020 14:39:25 -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=hbThSYyq; 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 S2388794AbgFWVjT (ORCPT + 15 others); Tue, 23 Jun 2020 17:39:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:47786 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388148AbgFWUHR (ORCPT ); Tue, 23 Jun 2020 16:07:17 -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 648B72064B; Tue, 23 Jun 2020 20:07:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942836; bh=YYeBL89PZqEY9Ml46NTuVrzX0FHcl+gQcwCR1Cwuz7k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hbThSYyq2+FQYvBh5AIgnbXoFkWrc8UQ6/Edex9iLp7/GqmV3QbrsKnybgDmx3d/d cgqBwz0XFALLkgyKBebq/VPozfXqj5721eFXhiiAbloocrAOfFlea0csiRzJV9JHl3 24F78wbt0qzGgwK6bPge0MSdEirwwbDb8Ku2VM08= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Mark Brown , Sasha Levin Subject: [PATCH 5.7 154/477] ASoC: rt5682: fix I2C/Soundwire dependencies Date: Tue, 23 Jun 2020 21:52:31 +0200 Message-Id: <20200623195414.876514030@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 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(+) -- 2.25.1 diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 8cdc68c141dc2..8a66f23a7b055 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