From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 10093EB64DC for ; Tue, 11 Jul 2023 06:38:36 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id DDF437F4; Tue, 11 Jul 2023 08:37:43 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz DDF437F4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1689057514; bh=4+1OPTUKS90sS9jGvC6Wn9idI+xTKRc38R1oLorStVs=; h=Date:Subject:To:Cc:References:From:In-Reply-To:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=aKeQa4jKxt5D6gD/AAPJSpGapPWWclXHEMrUG+rn1/xXbPT//kgtt1VhgiuH3AsNW VkeqXqBxhfcHhaak6NpwVk4w/QeqTZZemXxlp796CYbwrsKaQz6zvyEG28492B2n6H xDn/O0kr+ypgcnlTGAXP9VCcs+f/aFwSydtEYUpI= Received: by alsa1.perex.cz (Postfix, from userid 50401) id D9A89F80544; Tue, 11 Jul 2023 08:37:15 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 8CD8CF80249; Tue, 11 Jul 2023 08:37:15 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 38E73F80249; Tue, 11 Jul 2023 08:37:11 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 08134F80093 for ; Tue, 11 Jul 2023 08:36:55 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 08134F80093 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=Ov0loFaC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689057418; x=1720593418; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=4+1OPTUKS90sS9jGvC6Wn9idI+xTKRc38R1oLorStVs=; b=Ov0loFaCYdfkDo0BYEygWBVgxF6ZK8BSNoEoxM1iSqVTQUlG67Fvb6Xn cvNBMXW4iZ500y9qDedHGFUt26bY0BUJynxRwMqCx4O3pEHBJC3pM/6T6 +89tjOIi0tdBnGRRzdJmAJTm2aFb5IzLWqbiffBRwwQE/PWGJJ54pKm/a NoRahkwU/uku1nNtu+DpevAjBBM5cIyUErfRa7nDD8QyOxGJ6ZBS88xMi 4mYJkCfDNJR1+fVgUzuR85HAaWw087SMH/Y4xrptZhjcsmOx8fQ9uhrNF ZoaWewQvTkBOcd9VMmW3qVgHoJde4SFD7hSMNRDviXfD5xHb93co4Sauu Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10767"; a="362001211" X-IronPort-AV: E=Sophos;i="6.01,196,1684825200"; d="scan'208";a="362001211" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jul 2023 23:36:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10767"; a="698328881" X-IronPort-AV: E=Sophos;i="6.01,196,1684825200"; d="scan'208";a="698328881" Received: from baparham-mobl.ger.corp.intel.com (HELO [10.252.44.75]) ([10.252.44.75]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jul 2023 23:36:45 -0700 Message-ID: Date: Mon, 10 Jul 2023 09:35:57 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Firefox/102.0 Thunderbird/102.11.0 Subject: Re: [PATCH v2] ASoC: Intel: sof_rt5682: add jsl_rt5650 board config Content-Language: en-US To: Brent Lu , alsa-devel@alsa-project.org Cc: Cezary Rojewski , Liam Girdwood , Peter Ujfalusi , Bard Liao , Ranjani Sridharan , Kai Vehmanen , Mark Brown , Jaroslav Kysela , Takashi Iwai , Yong Zhi , Uday M Bhat , Gongjun Song , Ajye Huang , Arnd Bergmann , Terry Cheong , "Dharageswari . R" , Mac Chiang , Kuninori Morimoto , linux-kernel@vger.kernel.org References: <20230710141610.227988-1-brent.lu@intel.com> From: Pierre-Louis Bossart In-Reply-To: <20230710141610.227988-1-brent.lu@intel.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Message-ID-Hash: ASRXLEW7ZL5AGBFEMH3IU3XAW3T366MY X-Message-ID-Hash: ASRXLEW7ZL5AGBFEMH3IU3XAW3T366MY X-MailFrom: pierre-louis.bossart@linux.intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: On 7/10/23 16:16, Brent Lu wrote: > This configuration supports JSL boards which implement ALC5650 dual > I2S interface codec. Two DAI links are added: AIF1 (on codec side) for > headphone and AIF2 for speakers. > > Signed-off-by: Brent Lu > --- > sound/soc/intel/boards/Kconfig | 5 +- > sound/soc/intel/boards/sof_rt5682.c | 81 ++++++++++++++++++- > .../intel/common/soc-acpi-intel-jsl-match.c | 12 +++ > 3 files changed, 93 insertions(+), 5 deletions(-) > > diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig > index f472f603ab75..1fe830af2b84 100644 > --- a/sound/soc/intel/boards/Kconfig > +++ b/sound/soc/intel/boards/Kconfig > @@ -475,7 +475,7 @@ endif ## SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC || SND_SOC_SOF_HDA_AUDIO_CODEC > > if SND_SOC_SOF_HDA_LINK || SND_SOC_SOF_BAYTRAIL > config SND_SOC_INTEL_SOF_RT5682_MACH > - tristate "SOF with rt5682 codec in I2S Mode" > + tristate "SOF with rt5650/rt5682 codec in I2S Mode" > depends on I2C && ACPI > depends on ((SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC) &&\ > (MFD_INTEL_LPSS || COMPILE_TEST)) ||\ > @@ -485,6 +485,7 @@ config SND_SOC_INTEL_SOF_RT5682_MACH > select SND_SOC_RT1011 > select SND_SOC_RT1015 > select SND_SOC_RT1015P > + select SND_SOC_RT5645 > select SND_SOC_RT5682_I2C > select SND_SOC_RT5682S > select SND_SOC_DMIC > @@ -494,7 +495,7 @@ config SND_SOC_INTEL_SOF_RT5682_MACH > select SND_SOC_INTEL_SOF_REALTEK_COMMON > help > This adds support for ASoC machine driver for SOF platforms > - with rt5682 codec. > + with rt5650 or rt5682 codec. > Say Y if you have such a device. > If unsure select "N". > > diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c > index 7c034d671cf3..53451c1b67f8 100644 > --- a/sound/soc/intel/boards/sof_rt5682.c > +++ b/sound/soc/intel/boards/sof_rt5682.c > @@ -22,6 +22,7 @@ > #include > #include "../../codecs/rt5682.h" > #include "../../codecs/rt5682s.h" > +#include "../../codecs/rt5645.h" > #include "../../codecs/hdac_hdmi.h" > #include "../common/soc-intel-quirks.h" > #include "hda_dsp_common.h" > @@ -60,6 +61,7 @@ > #define SOF_MAX98390_SPEAKER_AMP_PRESENT BIT(24) > #define SOF_MAX98390_TWEETER_SPEAKER_PRESENT BIT(25) > #define SOF_RT1019_SPEAKER_AMP_PRESENT BIT(26) > +#define SOF_RT5650_HEADPHONE_CODEC_PRESENT BIT(27) > > > /* Default: MCLK on, MCLK 19.2M, SSP0 */ > @@ -305,7 +307,7 @@ static int sof_rt5682_codec_init(struct snd_soc_pcm_runtime *rtd) > struct sof_card_private *ctx = snd_soc_card_get_drvdata(rtd->card); > struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; > struct snd_soc_jack *jack; > - int ret; > + int ret, extra; two lines, and rename to e.g. extra_jack_data > + if (sof_rt5682_quirk & SOF_RT5650_HEADPHONE_CODEC_PRESENT) { > + extra = SND_JACK_MICROPHONE | SND_JACK_BTN_0; > + ret = snd_soc_component_set_jack(component, jack, &extra); I am a bit confused on why this wasn't set for rt5682? > + } else > + ret = snd_soc_component_set_jack(component, jack, NULL); > +static const struct snd_soc_dapm_route rt5650_spk_dapm_routes[] = { > + /* speaker */ > + { "Left Spk", NULL, "SPOL" }, > + { "Right Spk", NULL, "SPOR" }, > +}; > + > static const struct snd_soc_dapm_route dmic_map[] = { > /* digital mics */ > {"DMic", NULL, "SoC DMIC"}, > }; > > +static int rt5650_spk_init(struct snd_soc_pcm_runtime *rtd) > +{ > + struct snd_soc_card *card = rtd->card; > + int ret; > + > + ret = snd_soc_dapm_add_routes(&card->dapm, rt5650_spk_dapm_routes, > + ARRAY_SIZE(rt5650_spk_dapm_routes)); > + if (ret) > + dev_err(rtd->dev, "fail to add dapm routes, ret=%d\n", ret); > + > + return ret; > +} > + > static int dmic_init(struct snd_soc_pcm_runtime *rtd) > { > struct snd_soc_card *card = rtd->card; > @@ -614,6 +656,17 @@ static struct snd_soc_dai_link_component rt5682s_component[] = { > } > }; > > +static struct snd_soc_dai_link_component rt5650_components[] = { > + { > + .name = "i2c-10EC5650:00", > + .dai_name = "rt5645-aif1", > + }, > + { > + .name = "i2c-10EC5650:00", > + .dai_name = "rt5645-aif2", > + } > +}; can we move these definitions to realtek_common.c, chances are other boards will also use this codec. Thanks!