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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA7DFC433EF for ; Wed, 20 Oct 2021 16:04:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D509E6136F for ; Wed, 20 Oct 2021 16:04:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231180AbhJTQGV (ORCPT ); Wed, 20 Oct 2021 12:06:21 -0400 Received: from mga14.intel.com ([192.55.52.115]:12447 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231183AbhJTQGP (ORCPT ); Wed, 20 Oct 2021 12:06:15 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10143"; a="229088098" X-IronPort-AV: E=Sophos;i="5.87,167,1631602800"; d="scan'208";a="229088098" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2021 08:59:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,167,1631602800"; d="scan'208";a="494685422" Received: from brentlu-brix.itwn.intel.com ([10.5.253.56]) by orsmga008.jf.intel.com with ESMTP; 20 Oct 2021 08:59:16 -0700 From: Brent Lu To: alsa-devel@alsa-project.org Cc: Cezary Rojewski , Pierre-Louis Bossart , Liam Girdwood , Jie Yang , Mark Brown , Jaroslav Kysela , Takashi Iwai , Rander Wang , Kai Vehmanen , Huajun Li , Brent Lu , Paul Olaru , Mac Chiang , Curtis Malainey , Guennadi Liakhovetski , linux-kernel@vger.kernel.org, Yong Zhi , Vamshi Krishna Gopal , Bard Liao , Libin Yang , Gongjun Song , Liam Girdwood , Rander Wang , Hans de Goede , Andy Shevchenko Subject: [PATCH v4 2/6] ASoC: Intel: sof_rt5682: detect codec variant in probe function Date: Wed, 20 Oct 2021 23:57:11 +0800 Message-Id: <20211020155715.2045947-3-brent.lu@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211020155715.2045947-1-brent.lu@intel.com> References: <20211020155715.2045947-1-brent.lu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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