All of lore.kernel.org
 help / color / mirror / Atom feed
From: Brent Lu <brent.lu@intel.com>
To: alsa-devel@alsa-project.org
Cc: Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
	Takashi Iwai <tiwai@suse.com>,
	Cezary Rojewski <cezary.rojewski@intel.com>,
	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
	Jie Yang <yang.jie@linux.intel.com>,
	Brent Lu <brent.lu@intel.com>,
	Kai Vehmanen <kai.vehmanen@linux.intel.com>,
	Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>,
	Yong Zhi <yong.zhi@intel.com>,
	Vamshi Krishna Gopal <vamshi.krishna.gopal@intel.com>,
	linux-kernel@vger.kernel.org, Rander Wang <rander.wang@intel.com>,
	Bard Liao <bard.liao@intel.com>,
	Malik_Hsu <malik_hsu@wistron.corp-partner.google.com>,
	Libin Yang <libin.yang@intel.com>,
	Hans de Goede <hdegoede@redhat.com>,
	Charles Keepax <ckeepax@opensource.cirrus.com>,
	Paul Olaru <paul.olaru@oss.nxp.com>,
	Curtis Malainey <cujomalainey@chromium.org>,
	Mac Chiang <mac.chiang@intel.com>,
	Gongjun Song <gongjun.song@intel.com>
Subject: [PATCH v2 2/3] ASoC: Intel: sof_rt5682: detect codec variant in probe function
Date: Thu,  7 Oct 2021 21:35:15 +0800	[thread overview]
Message-ID: <20211007133516.1464655-3-brent.lu@intel.com> (raw)
In-Reply-To: <20211007133516.1464655-1-brent.lu@intel.com>

Detect whether the headphone codec is ALC5682I-VS or not in probe
function so we don't need to duplicate all board configs for this new
variant.

Signed-off-by: Brent Lu <brent.lu@intel.com>
---
 sound/soc/intel/boards/sof_rt5682.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index 613662eedd0d..c41c584379d9 100644
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -864,6 +864,10 @@ static int sof_audio_probe(struct platform_device *pdev)
 	if ((sof_rt5682_quirk & SOF_SPEAKER_AMP_PRESENT) && !mach->quirk_data)
 		sof_rt5682_quirk &= ~SOF_SPEAKER_AMP_PRESENT;
 
+	/* Detect the headset codec variant */
+	if (acpi_dev_present("RTL5682", NULL, -1))
+		sof_rt5682_quirk |= SOF_RT5682S_HEADPHONE_CODEC_PRESENT;
+
 	if (soc_intel_is_byt() || soc_intel_is_cht()) {
 		is_legacy_cpu = 1;
 		dmic_be_num = 0;
-- 
2.25.1


WARNING: multiple messages have this Message-ID (diff)
From: Brent Lu <brent.lu@intel.com>
To: alsa-devel@alsa-project.org
Cc: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>,
	Cezary Rojewski <cezary.rojewski@intel.com>,
	Jie Yang <yang.jie@linux.intel.com>,
	Rander Wang <rander.wang@intel.com>,
	Mac Chiang <mac.chiang@intel.com>,
	Gongjun Song <gongjun.song@intel.com>,
	Bard Liao <bard.liao@intel.com>, Takashi Iwai <tiwai@suse.com>,
	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
	Vamshi Krishna Gopal <vamshi.krishna.gopal@intel.com>,
	Yong Zhi <yong.zhi@intel.com>,
	Charles Keepax <ckeepax@opensource.cirrus.com>,
	Hans de Goede <hdegoede@redhat.com>,
	Mark Brown <broonie@kernel.org>,
	Paul Olaru <paul.olaru@oss.nxp.com>,
	Brent Lu <brent.lu@intel.com>, Libin Yang <libin.yang@intel.com>,
	Malik_Hsu <malik_hsu@wistron.corp-partner.google.com>,
	Kai Vehmanen <kai.vehmanen@linux.intel.com>,
	Liam Girdwood <lgirdwood@gmail.com>,
	linux-kernel@vger.kernel.org,
	Curtis Malainey <cujomalainey@chromium.org>
Subject: [PATCH v2 2/3] ASoC: Intel: sof_rt5682: detect codec variant in probe function
Date: Thu,  7 Oct 2021 21:35:15 +0800	[thread overview]
Message-ID: <20211007133516.1464655-3-brent.lu@intel.com> (raw)
In-Reply-To: <20211007133516.1464655-1-brent.lu@intel.com>

Detect whether the headphone codec is ALC5682I-VS or not in probe
function so we don't need to duplicate all board configs for this new
variant.

Signed-off-by: Brent Lu <brent.lu@intel.com>
---
 sound/soc/intel/boards/sof_rt5682.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index 613662eedd0d..c41c584379d9 100644
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -864,6 +864,10 @@ static int sof_audio_probe(struct platform_device *pdev)
 	if ((sof_rt5682_quirk & SOF_SPEAKER_AMP_PRESENT) && !mach->quirk_data)
 		sof_rt5682_quirk &= ~SOF_SPEAKER_AMP_PRESENT;
 
+	/* Detect the headset codec variant */
+	if (acpi_dev_present("RTL5682", NULL, -1))
+		sof_rt5682_quirk |= SOF_RT5682S_HEADPHONE_CODEC_PRESENT;
+
 	if (soc_intel_is_byt() || soc_intel_is_cht()) {
 		is_legacy_cpu = 1;
 		dmic_be_num = 0;
-- 
2.25.1


  parent reply	other threads:[~2021-10-07 13:37 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-07 13:35 [PATCH v2 0/3] Multiple headphone codec driver support Brent Lu
2021-10-07 13:35 ` Brent Lu
2021-10-07 13:35 ` [PATCH v2 1/3] ASoC: soc-acpi: add comp_ids field for machine driver matching Brent Lu
2021-10-07 13:35   ` Brent Lu
2021-10-07 17:05   ` Cezary Rojewski
2021-10-07 17:05     ` Cezary Rojewski
2021-10-07 17:27     ` Pierre-Louis Bossart
2021-10-07 17:27       ` Pierre-Louis Bossart
2021-10-07 18:46       ` Cezary Rojewski
2021-10-07 18:46         ` Cezary Rojewski
2021-10-07 13:35 ` Brent Lu [this message]
2021-10-07 13:35   ` [PATCH v2 2/3] ASoC: Intel: sof_rt5682: detect codec variant in probe function Brent Lu
2021-10-07 13:35 ` [PATCH v2 3/3] ASoC: Intel: sof_rt5682: use comp_ids to enumerate rt5682s Brent Lu
2021-10-07 13:35   ` Brent Lu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211007133516.1464655-3-brent.lu@intel.com \
    --to=brent.lu@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=bard.liao@intel.com \
    --cc=broonie@kernel.org \
    --cc=cezary.rojewski@intel.com \
    --cc=ckeepax@opensource.cirrus.com \
    --cc=cujomalainey@chromium.org \
    --cc=gongjun.song@intel.com \
    --cc=guennadi.liakhovetski@linux.intel.com \
    --cc=hdegoede@redhat.com \
    --cc=kai.vehmanen@linux.intel.com \
    --cc=lgirdwood@gmail.com \
    --cc=libin.yang@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mac.chiang@intel.com \
    --cc=malik_hsu@wistron.corp-partner.google.com \
    --cc=paul.olaru@oss.nxp.com \
    --cc=perex@perex.cz \
    --cc=pierre-louis.bossart@linux.intel.com \
    --cc=rander.wang@intel.com \
    --cc=tiwai@suse.com \
    --cc=vamshi.krishna.gopal@intel.com \
    --cc=yang.jie@linux.intel.com \
    --cc=yong.zhi@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.