Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp451101pxb; Thu, 9 Sep 2021 04:54:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzrbzdKrJVp4vPgBfmhq2PW/deyCsaoQoTFg5OLDUTegDSwaqAjYsifQU1RwiTCPqMg6f30 X-Received: by 2002:a6b:6613:: with SMTP id a19mr2279096ioc.167.1631188475721; Thu, 09 Sep 2021 04:54:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631188475; cv=none; d=google.com; s=arc-20160816; b=g06AF2q5VHVkHr0K1Tm9mUwkuGbZWmlN6JVrZw1skuBSuQpFh4i2glA59llbpmpZpe imSkQWWih2WXWTS6pF4Pbf4tRqeYqZ/lIYCSPh7kzuh0gkg1xezmvwwtTkN1XEyFsq4h xxviXRtVdYRO4/AQ8ShsXMwhL6AKqZoP4tvKEr1AwIoMWRrqz5lgexDVe3Szxwre9sZb 3xxaddH+kt9awwsZZO2AKCavL+O3RFcOVWMspyrcgXOb+LXqGRYeBEHvTBpr8sW+V2Ic Fjus2frudV0v/Y7GfidXtebyrVbnaS1h2i4Gvq78phscDtb72C6ZTmTbAKYwZK/BDgPY OQug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=kMbVUVDlzB52sv2G0z8rpqUs2fHiiM9qtMKT2gMQiPc=; b=gY4Ad5Adm/yW8L85p2pbr8Rr1fwrpAYGiCGxhsIHGulQ7sleTcf/2951VPXc2KrBCk iLEeLQ54ezabot8YA1umOqX921r5YwvhWnzuWo256+9h6JQyZRyOdZaInMR/aWxH5PXP 6Xlbwf6mE4GewecP/5eQDdbXQOojhIy77n3T5z+uOcGMEGwJ9TkWFU5qACIzo/Ta5MyF pDoAn0/OU47hw3LclPpNxOAnOkxuoBdD09zMObm5QnXFWwXTVZJB0QJzs4xbuL4HrEii 1IZb1hVOyL2DUzA/qHKUO8eCwIZ5aSttwWUwmprFRgnQrXFU6LOgiFxD/nkJVgRd67WI V+5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sVx2+A4c; 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 i62si1339496iof.83.2021.09.09.04.54.18; Thu, 09 Sep 2021 04:54:35 -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=k20201202 header.b=sVx2+A4c; 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 S242554AbhIILwT (ORCPT + 99 others); Thu, 9 Sep 2021 07:52:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:53540 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237419AbhIILrp (ORCPT ); Thu, 9 Sep 2021 07:47:45 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 551866124B; Thu, 9 Sep 2021 11:43:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631187795; bh=6lulUNxDGiu42j/7vp+SGcWHeqNR2I22Yu3VZeFwd2w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sVx2+A4cjrrKL53ZxmTbHl8PeS7n+nUolMhgzBwLRANGy3Z/M1ZUB+kgr7zZJkMIv 4QHPPloNlsGFDIqBKIzeqGg0KnZM8bxwKNMpszbaBzYU1nXzgbYvTrqkWlF2lRRa0x 25A6YXXlNJ8X3B1oJOHrOeKAD/xYzfWyFvHZCLcjaWd8GdT6b/1dC8x9Q7eosz+EjY dsL6hBQZn0JkIoG6SsMd6t3jLS//tXQ4URXlhIecCaFbQJX2E51CExnIb5/g0tnm0Q DQwDm7TcTJg230hcOmT2jvoEmsPZp8BJ9TWMyUpXi/SEtSAuOZZ0nVnPtpnvrI/uWU Az7maMq/h3UJw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hans de Goede , Pierre-Louis Bossart , Mark Brown , Sasha Levin , alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.14 100/252] ASoC: Intel: bytcr_rt5640: Move "Platform Clock" routes to the maps for the matching in-/output Date: Thu, 9 Sep 2021 07:38:34 -0400 Message-Id: <20210909114106.141462-100-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909114106.141462-1-sashal@kernel.org> References: <20210909114106.141462-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hans de Goede [ Upstream commit dccd1dfd0770bfd494b68d1135b4547b2c602c42 ] Move the "Platform Clock" routes for the "Internal Mic" and "Speaker" routes to the intmic_*_map[] / *_spk_map[] arrays. This ensures that these "Platform Clock" routes do not get added when the BYT_RT5640_NO_INTERNAL_MIC_MAP / BYT_RT5640_NO_SPEAKERS quirks are used. Signed-off-by: Hans de Goede Acked-by: Pierre-Louis Bossart Link: https://lore.kernel.org/r/20210802142501.991985-2-hdegoede@redhat.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/intel/boards/bytcr_rt5640.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index 91a6d712eb58..c403fb672594 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -290,9 +290,6 @@ static const struct snd_soc_dapm_widget byt_rt5640_widgets[] = { static const struct snd_soc_dapm_route byt_rt5640_audio_map[] = { {"Headphone", NULL, "Platform Clock"}, {"Headset Mic", NULL, "Platform Clock"}, - {"Internal Mic", NULL, "Platform Clock"}, - {"Speaker", NULL, "Platform Clock"}, - {"Headset Mic", NULL, "MICBIAS1"}, {"IN2P", NULL, "Headset Mic"}, {"Headphone", NULL, "HPOL"}, @@ -300,19 +297,23 @@ static const struct snd_soc_dapm_route byt_rt5640_audio_map[] = { }; static const struct snd_soc_dapm_route byt_rt5640_intmic_dmic1_map[] = { + {"Internal Mic", NULL, "Platform Clock"}, {"DMIC1", NULL, "Internal Mic"}, }; static const struct snd_soc_dapm_route byt_rt5640_intmic_dmic2_map[] = { + {"Internal Mic", NULL, "Platform Clock"}, {"DMIC2", NULL, "Internal Mic"}, }; static const struct snd_soc_dapm_route byt_rt5640_intmic_in1_map[] = { + {"Internal Mic", NULL, "Platform Clock"}, {"Internal Mic", NULL, "MICBIAS1"}, {"IN1P", NULL, "Internal Mic"}, }; static const struct snd_soc_dapm_route byt_rt5640_intmic_in3_map[] = { + {"Internal Mic", NULL, "Platform Clock"}, {"Internal Mic", NULL, "MICBIAS1"}, {"IN3P", NULL, "Internal Mic"}, }; @@ -354,6 +355,7 @@ static const struct snd_soc_dapm_route byt_rt5640_ssp0_aif2_map[] = { }; static const struct snd_soc_dapm_route byt_rt5640_stereo_spk_map[] = { + {"Speaker", NULL, "Platform Clock"}, {"Speaker", NULL, "SPOLP"}, {"Speaker", NULL, "SPOLN"}, {"Speaker", NULL, "SPORP"}, @@ -361,6 +363,7 @@ static const struct snd_soc_dapm_route byt_rt5640_stereo_spk_map[] = { }; static const struct snd_soc_dapm_route byt_rt5640_mono_spk_map[] = { + {"Speaker", NULL, "Platform Clock"}, {"Speaker", NULL, "SPOLP"}, {"Speaker", NULL, "SPOLN"}, }; -- 2.30.2