Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp1648848pxb; Wed, 20 Oct 2021 09:07:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSM7MyAimf4Mg6gsrzDsn5T7MeaF6BuELdmL9If5XZATgB8ymW8ZOJ0UkL6BJt9+Zrrd1a X-Received: by 2002:a05:6a00:984:b0:44c:e996:fc2d with SMTP id u4-20020a056a00098400b0044ce996fc2dmr152909pfg.31.1634746057083; Wed, 20 Oct 2021 09:07:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634746057; cv=none; d=google.com; s=arc-20160816; b=KmJ2QOhuE1B7DkniSb+1EXxx81N9F5nHERfjwuf1PlwgrTNNFrgU8rg1hyJSydrtjV PxL3w8zu4n59gIaVjiQeMinpCxjF7hqsAisaElCfaGcIIskW/gu/6V4Z1vtjKJcnVk37 MOv4rgOq4XbaN8AP2k5KFsXjnje32vq8bDzNURVCEXvXtSQGQ0NKN80Y04/0fGB32liZ /6xsF8ZXpKVW9Nt8qA3AWvaVZ0T9mDT4pYgiGooM8lSCYahAslGU9xXsYU3+FXJwsVEI De8T2nuWR6uK9gp1fu9VMsB9UnQF8GuhttZhS07aRMd2ef+rC+5QTW2nqZHJTZh3HFuK bM2Q== 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=WG2MJxN43CmLKB4xFQbacXV1cSiFZelYkaMoP0OgUBTwSUOAq5eTSE0xOalERn/nyd dhgbbwAyZkOwvtY+HAhOXY4avV8oNewZk/iOMUB8ChKUUjMTDOcS0j/oLHS7uQNHc1ac sIVNMLPkJ7kfXg4mNQougoZ7X38ZCnKLIVNNAZPiqiQN2Pv/u8gie4DE+bvFZpUDReY4 c6wkuzPDnXpEXUpZnetnTKArhwod5MYKmew5PKmfaMyDuRg5EO+McxdKkjyuQ+s3a8Gi +u3FK7t81wthKUnp3tYeAZenPavlavdd0P3pje1a5l3G/Xh6lrlHbgUe5CXGkqr/iWI7 9/cA== 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 p15si3742739plw.13.2021.10.20.09.07.22; Wed, 20 Oct 2021 09:07:37 -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 S231208AbhJTQGU (ORCPT + 99 others); Wed, 20 Oct 2021 12:06:20 -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