Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp932485ybt; Wed, 17 Jun 2020 18:15:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJweZdmIkiiCRsX/PjjYBcDy0p7zEqNF8FZhPlfgXCat4aPWrwzHor3QInMB8QBP0jw/gLWc X-Received: by 2002:a17:906:68ca:: with SMTP id y10mr1723396ejr.322.1592442953339; Wed, 17 Jun 2020 18:15:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592442953; cv=none; d=google.com; s=arc-20160816; b=eG9diEOjAmRkszeDGqGvihhRFMeATBxXToNb0WAcOHeic5VM72ibhNQlu++vxUm5ne nJplHzPey7Np877zVCDRfc2r/8pgLDdZn8p4dqrR9dI0TBGOXnFCMRbWlr11+qtQ9/9f TLtEpxeB6Fb7oUsoZ284l6ueCmwvvVeQ2JilM8faPcsrhjtAPVAEgiNXLzPQ8rw7MyOh Ki/E8mOvVFGrV4EZIkP7ugj7a0oY/AW0scFhP0lkn/AfnBRxTdAduLwlemFANJJVjCwp WoOtOtDSneUEbYcKDuS/8HFCyczl1Tx0qKUbrr5bZ9pxpU6uglSQKt7cLSkNwx0CgbD8 yf8Q== 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=z7XlMAMeDTNMnWrA7tW2pEUf/WJoRhCvquQAbodIdxc=; b=J8vi5/5q8t4CGgE3JymBeRe5HaNa5Hg6yQtpYAHJguLVUZxRu4p770NCUMVPJeOrhi XCDfKjef2zO3G3TLKovoV9Xp2EweGVMWPRsyI9DQYhPQYe26D89EQ9BD48fDrWcAbbuU q4WduRJwO1ZvKTFb2+2Ait9VICVfrPh5358SZqtrRuzm+PYP/97LFlWnzG/yvHAZmSQI GpLGfgF8jNAH8S8ubaANaqEKGCpxO2h8aLQYBstN7U+uQZgr+8RA65vBYv7hL7FhXOYJ 735nfHyLP3eln0j7PsAu6HWOBGJ3kyYzIeiEM9twK+U3NaPquyaOB5aREExQ8btkpc71 x1fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XthIOUjf; 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 z10si905908ejb.517.2020.06.17.18.15.31; Wed, 17 Jun 2020 18:15:53 -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=XthIOUjf; 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 S1728705AbgFRBLD (ORCPT + 99 others); Wed, 17 Jun 2020 21:11:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:38680 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727809AbgFRBK7 (ORCPT ); Wed, 17 Jun 2020 21:10:59 -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 7A996214DB; Thu, 18 Jun 2020 01:10:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442659; bh=rGnkqzOklVdCYmtctnndT4Xj7oX+ndcWZlmsfC9t1nQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XthIOUjfoIfJn6EEqPux7QG7JwkqZfGdn+/wGnDRJPEInZF/cWZDcQcTlF7bzDKUU lxngtltCsXXcyha2RZ9bp/ztAhov6zmJqxEsKlcQ6x1qw+JvgUk01xemNosPy3SeD2 +LzRT9+0CI1BfwT+k36G5YrYU7olLOducGLhOQXM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wei Li , Mark Brown , Sasha Levin , alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.7 130/388] ASoC: Fix wrong dependency of da7210 and wm8983 Date: Wed, 17 Jun 2020 21:03:47 -0400 Message-Id: <20200618010805.600873-130-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: Wei Li [ Upstream commit c1c050ee74d67aeb879fd38e3a07139d7fdb79f4 ] As these two drivers support I2C and SPI, we should add the SND_SOC_I2C_AND_SPI dependency instead. Fixes: ce0c97f8a2936 ("ASoC: Fix SND_SOC_ALL_CODECS imply SPI fallout") Signed-off-by: Wei Li Link: https://lore.kernel.org/r/20200420202410.47327-3-liwei391@huawei.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 8cdc68c141dc..7d2cbed55a9d 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -717,7 +717,7 @@ config SND_SOC_L3 config SND_SOC_DA7210 tristate - depends on I2C + depends on SND_SOC_I2C_AND_SPI config SND_SOC_DA7213 tristate "Dialog DA7213 CODEC" @@ -1569,7 +1569,7 @@ config SND_SOC_WM8978 config SND_SOC_WM8983 tristate - depends on I2C + depends on SND_SOC_I2C_AND_SPI config SND_SOC_WM8985 tristate "Wolfson Microelectronics WM8985 and WM8758 codec driver" -- 2.25.1