Received: by 2002:a05:6a10:d5a5:0:0:0:0 with SMTP id gn37csp1378103pxb; Thu, 7 Oct 2021 06:40:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxsd+3EELElLUMK7+vCbqwv6ovaa+68EPyP+g+PXFerhZdz3oO0DijnBURZZOhvhllMnc8B X-Received: by 2002:a05:6402:26c4:: with SMTP id x4mr6290792edd.127.1633614007026; Thu, 07 Oct 2021 06:40:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633614007; cv=none; d=google.com; s=arc-20160816; b=b+aChjwCrkceAGVwL2n240ZjVa/HcraJ+59pNHlWaXign012NlQsoKDJrJ2sj1S94N ixq9FyrN2a5NpzxeP1WtIHbEDBiPC1np6pbKM5CK0J16Tfy2UbJ8mAfSzg1ldFoIMSEq 3E09iuHLCamryHB1jP+tEWQ7Z6Q8crfzGOCv0aOTUWPE75aC8E3IaJwEUcbXKqGG2pOw 9Aw4xwTzs7BJSPs2opKvo4Dj6L+0tW/p5+t93CcaZ8t/z1/DdOugcuX8q9GF1A3LeXhC T24iR+2T+OMuVOFCHLDAKDchBAHeef/CmvXqwmNReRr4bHXrOi5pEdQ3FLkJ756d3OV3 2/qA== 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=whZiE3RTycPwI4z0PtQ93nt3dZInlk5SBJrbfAdFNEz5J8+TplSEdCjXbC3Pb/XFLG XbFZ028RcrZnXKWz/mAkbl/NaJehE3utdOHmr2Sg0f8wcH6liZYFH4KrP8g4qEITZn0F ZNtBJxvmr7lBvoT8Z6PdIH7M4+k1F+5hIRQXCrX88QpdZOpppWqTxI6yFDF+/wJA2Bdp AISSGzG3RQphwP0FeFrIwBpI2vLR752x1F4r86it91UNUJOje4XMpj4ZA3i5CwXzteNz Ut4gDGbhSMKVDRYvqWGupyc1YikOuwS3VtpX5nWlT2RD3tKVrDw8l77q2cQnQf3DSH3x /olg== 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 i17si9747987edc.134.2021.10.07.06.39.40; Thu, 07 Oct 2021 06:40:07 -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 S241669AbhJGNjK (ORCPT + 99 others); Thu, 7 Oct 2021 09:39:10 -0400 Received: from mga02.intel.com ([134.134.136.20]:15595 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241655AbhJGNjH (ORCPT ); Thu, 7 Oct 2021 09:39:07 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10129"; a="213388708" X-IronPort-AV: E=Sophos;i="5.85,354,1624345200"; d="scan'208";a="213388708" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Oct 2021 06:37:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,354,1624345200"; d="scan'208";a="484523182" Received: from brentlu-brix.itwn.intel.com ([10.5.253.56]) by fmsmga007.fm.intel.com with ESMTP; 07 Oct 2021 06:37:08 -0700 From: Brent Lu To: alsa-devel@alsa-project.org Cc: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Cezary Rojewski , Pierre-Louis Bossart , Jie Yang , Brent Lu , Kai Vehmanen , Guennadi Liakhovetski , Yong Zhi , Vamshi Krishna Gopal , linux-kernel@vger.kernel.org, Rander Wang , Bard Liao , Malik_Hsu , Libin Yang , Hans de Goede , Charles Keepax , Paul Olaru , Curtis Malainey , Mac Chiang , Gongjun Song Subject: [PATCH v2 2/3] ASoC: Intel: sof_rt5682: detect codec variant in probe function Date: Thu, 7 Oct 2021 21:35:15 +0800 Message-Id: <20211007133516.1464655-3-brent.lu@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211007133516.1464655-1-brent.lu@intel.com> References: <20211007133516.1464655-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