Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp216444pxb; Tue, 19 Oct 2021 01:05:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4ri2l7oEDckQrWL4qInodfh8W+2/fAmy4hJkpq/0C4iDe5pVdQq7TOaB2lN0ACOT5WGGE X-Received: by 2002:a17:902:c104:b0:13f:59f9:db92 with SMTP id 4-20020a170902c10400b0013f59f9db92mr31584941pli.75.1634630753513; Tue, 19 Oct 2021 01:05:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634630753; cv=none; d=google.com; s=arc-20160816; b=NOiL3Cuw65bQPNX5BFke3orCeo/FY3vu2H+L/m1m+aAiII0dlbIklLP+NxWkiAsXMA w+BNT/kiDOigvtR1BhdHueD4sO8Ko7imDL7Nygxist2TCplJJkKvx36LLQnYd9pJhpnY bVAPJeZh3fh2P5eJj+7Sa76d1u9Ig/zysb1vsewfLwIctRQ0wBcIEcbq4Rnd4vCAKahP rm1LTp/CQZ61foLqGQZ+cVQ5i0k5NqS9Y8I83R5IhGnJqvP9QMTySwuua7+C3UX6S+WB YfinlDrpNztsaAK1SUameOGkI4Z8Fbb/DKUVc+9Q2yXagqbQXlAsCZfNVFG1liVcMNXm DgKg== 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; bh=AvnRHExIVLOKlO3xVv0mi7a8kmgKB3ERBp1dH9K8lTo=; b=cV7lV+tj7q05ttL5ERClN+CGxPM9/XBF0XDJmG7G9x1CpmWohPSibflkFUHptokz6T zTLK8gP1cPUeXwjFr21XlYL/rgES8VstqYfjNWp8FYffom3PdhaBPXAbzeK466mcrH2h RsiPXQdSqAANchvy8+39EAsIyZS383O4biOE4vsPVVa7tSm8U7dJ+9598cMrdz/28WPC bYN7JOwq2vPeXbRlzbIWHHQYjN2QmNPCO6A8txaYSxWegRls1kVaI42jcY+a/V4SRErQ xAUdIM5xINwThaExq1D7zOfL3SzFjsR3sD43JQOPf1NfZ0CubgqdHeHgKFaN136VWzCt ZkPw== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p3si25213096plr.115.2021.10.19.01.05.40; Tue, 19 Oct 2021 01:05: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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234642AbhJSIFV (ORCPT + 99 others); Tue, 19 Oct 2021 04:05:21 -0400 Received: from mga04.intel.com ([192.55.52.120]:20573 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231187AbhJSIFT (ORCPT ); Tue, 19 Oct 2021 04:05:19 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10141"; a="227218169" X-IronPort-AV: E=Sophos;i="5.85,383,1624345200"; d="scan'208";a="227218169" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Oct 2021 01:02:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,383,1624345200"; d="scan'208";a="493984342" Received: from brentlu-brix.itwn.intel.com ([10.5.253.56]) by orsmga008.jf.intel.com with ESMTP; 19 Oct 2021 01:02:47 -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 , Kai Vehmanen , Rander Wang , Paul Olaru , Guennadi Liakhovetski , Brent Lu , Mac Chiang , Curtis Malainey , linux-kernel@vger.kernel.org, Yong Zhi , Vamshi Krishna Gopal , Bard Liao , Libin Yang , Christophe JAILLET , Gongjun Song , Liam Girdwood , Rander Wang , Hans de Goede Subject: [PATCH v3 2/6] ASoC: Intel: sof_rt5682: detect codec variant in probe function Date: Tue, 19 Oct 2021 15:59:37 +0800 Message-Id: <20211019075941.2037787-3-brent.lu@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019075941.2037787-1-brent.lu@intel.com> References: <20211019075941.2037787-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