From patchwork Thu Jul 20 09:26:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brent Lu X-Patchwork-Id: 122950 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2829928vqt; Wed, 19 Jul 2023 19:07:59 -0700 (PDT) X-Google-Smtp-Source: APBJJlFzk37COtRQtz1gEUunPDvWjihfNajBfGj6psgf7+ASXhy0a2O4EnGrcgS1PG7Ce7A7lefr X-Received: by 2002:a17:906:76d5:b0:992:a618:c3c4 with SMTP id q21-20020a17090676d500b00992a618c3c4mr4419045ejn.66.1689818879638; Wed, 19 Jul 2023 19:07:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689818879; cv=none; d=google.com; s=arc-20160816; b=bLbrkXJbszL4T0/5PVcmya0qn1tT1HafjWqj20ISp2IkudDvDa2MrjRiPeVgAGtJCj tBtVHm+8mHSKMBuzkQ90j+1n9FB+dS96Lv+nYmcHQGYWgepUNo5Z7b5t1dtDD5cGrF4P +tihusC5gu6Eeh0wXRY8TEV+/+zkZ0M0nyTDH3iEF22LxrdlhL6i6iXp0dzNzYrBu65A C8aY5Utc+ylLMTo8I8yCElptk7fplR2Myw18Slq3TbsWbf+37K3dWil9ZEq6NgQrSjRf +EHVhclDKxXiYEESEHG/71v4s3umkKlnFyVoUXKSZSIYyzHazVSvsF55zJNKv26m1P8S GVYA== 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 :dkim-signature; bh=kF2iX/bSBTpreQwLz3uE+KaLQ5pa1Xxt/mwXS67wkBk=; fh=d5kaFi490xhtCCJ3TerUmGkycRMyMY6ISVyskXPOS9g=; b=X2YXhQg6IC/1DLUvcRY/jgqJ9fRqAaa4MCDp5Ep5lh4kJW5pI/tB5q7syMLGdX0sD/ cLc6tUv7pn/LFbk5XLUqo4tWfcjikIOXi29R4dgifeyW6kO93kGc6OW1oUvlAUaQEXEc B6Ma14WJeQub1B7RHbo7kie4yZHmrmh9ILiy0Xcq4APt+riCrfY/+W/ODuvpgjmjTc2M Mgweh/v8LrTG9h4ZhbTXufT5KaEQ+lsB+1ICJS+q817TyxnHNOank72RcsgLEbJCn8Mz XrpTl16Ck0U0TsRW+WL/ruM7HtZRze9FuJ0v+sH9qwQKelAAQWIa6wNVYBWgMuTX91Bw F4FA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=P3lJJemm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u11-20020a1709060b0b00b0098d373fa9d9si3876830ejg.149.2023.07.19.19.07.35; Wed, 19 Jul 2023 19:07:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=P3lJJemm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229884AbjGTBdD (ORCPT + 99 others); Wed, 19 Jul 2023 21:33:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229890AbjGTBcv (ORCPT ); Wed, 19 Jul 2023 21:32:51 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B96FB2123 for ; Wed, 19 Jul 2023 18:32:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689816769; x=1721352769; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zeA33BKa8/o/DKqLCyRftnCpl8+VLyzMwsQTIM5tBwo=; b=P3lJJemmyFlZbzIuSR9r4szClslk0QEp8mMeB5Y/kvLw4DrGIQ+nIfJa YTSHr9C5ahW5FXl6xM9Y009DG53lo2D56LwfvA4hp/wJoZ+zu1ZEtoihs H1cTXx4uXXE2hWq3eePuDntrXF1YIEn5m5y/67wmjRIebUhD7QkyXr/lq AKg2BqIB6TGI3wiFHQzFBmyqe1EeLtadStHHI00eB3AX4cDcPLpMoidKS RoJ+KTerW4jNI7NE7jQd4AEWJgrzc/hr2baHT7G0l4XhvAi/vwdbPMx8b s32Ojrxa0xQU6nS46rBJalXgGRIMUUMPaJpIGOzRqAEm0u0ymwbX7f3je g==; X-IronPort-AV: E=McAfee;i="6600,9927,10776"; a="364067964" X-IronPort-AV: E=Sophos;i="6.01,216,1684825200"; d="scan'208";a="364067964" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jul 2023 18:32:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.01,202,1684825200"; d="scan'208";a="867681304" Received: from brentlu-desktop.itwn.intel.com ([10.5.252.92]) by fmsmga001.fm.intel.com with ESMTP; 19 Jul 2023 18:32:46 -0700 From: Brent Lu To: alsa-devel@alsa-project.org Cc: Cezary Rojewski , Pierre-Louis Bossart , Liam Girdwood , Peter Ujfalusi , Bard Liao , Ranjani Sridharan , Kai Vehmanen , Mark Brown , Jaroslav Kysela , Takashi Iwai , Brent Lu , linux-kernel@vger.kernel.org, Yong Zhi , Ajye Huang , Uday M Bhat , Terry Cheong , Mac Chiang , "Dharageswari . R" , Kuninori Morimoto Subject: [PATCH 2/2] ASoC: Intel: sof_rt5682: remove SOF_MAX98390_TWEETER_SPEAKER_PRESENT flag Date: Thu, 20 Jul 2023 17:26:28 +0800 Message-Id: <20230720092628.758834-3-brent.lu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230720092628.758834-1-brent.lu@intel.com> References: <20230720092628.758834-1-brent.lu@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771903521544035476 X-GMAIL-MSGID: 1771903521544035476 Remove the SOF_MAX98390_TWEETER_SPEAKER_PRESENT flag from driver since the number of amplifiers could be queried from ACPI by counting the device instance. Signed-off-by: Brent Lu --- sound/soc/intel/boards/sof_rt5682.c | 37 ++--------------------------- 1 file changed, 2 insertions(+), 35 deletions(-) diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index b4f07bdcf8b4..9116f4df4752 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -59,7 +59,6 @@ #define SOF_SSP_BT_OFFLOAD_PRESENT BIT(22) #define SOF_RT5682S_HEADPHONE_CODEC_PRESENT BIT(23) #define SOF_MAX98390_SPEAKER_AMP_PRESENT BIT(24) -#define SOF_MAX98390_TWEETER_SPEAKER_PRESENT BIT(25) #define SOF_RT1019_SPEAKER_AMP_PRESENT BIT(26) #define SOF_RT5650_HEADPHONE_CODEC_PRESENT BIT(27) @@ -195,23 +194,6 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = { SOF_RT5682_SSP_AMP(2) | SOF_RT5682_NUM_HDMIDEV(4)), }, - { - .callback = sof_rt5682_quirk_cb, - .matches = { - DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"), - DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98390_ALC5682I_I2S_4SPK"), - }, - .driver_data = (void *)(SOF_RT5682_MCLK_EN | - SOF_RT5682_SSP_CODEC(0) | - SOF_SPEAKER_AMP_PRESENT | - SOF_MAX98390_SPEAKER_AMP_PRESENT | - SOF_MAX98390_TWEETER_SPEAKER_PRESENT | - SOF_RT5682_SSP_AMP(1) | - SOF_RT5682_NUM_HDMIDEV(4) | - SOF_BT_OFFLOAD_SSP(2) | - SOF_SSP_BT_OFFLOAD_PRESENT), - - }, { .callback = sof_rt5682_quirk_cb, .matches = { @@ -850,17 +832,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, sof_rt1011_dai_link(&links[id]); } else if (sof_rt5682_quirk & SOF_MAX98390_SPEAKER_AMP_PRESENT) { - if (sof_rt5682_quirk & - SOF_MAX98390_TWEETER_SPEAKER_PRESENT) { - links[id].codecs = max_98390_4spk_components; - links[id].num_codecs = ARRAY_SIZE(max_98390_4spk_components); - } else { - links[id].codecs = max_98390_components; - links[id].num_codecs = ARRAY_SIZE(max_98390_components); - } - links[id].init = max_98390_spk_codec_init; - links[id].ops = &max_98390_ops; - + max_98390_dai_link(&links[id]); } else if (sof_rt5682_quirk & SOF_RT5650_HEADPHONE_CODEC_PRESENT) { links[id].codecs = &rt5650_components[1]; links[id].num_codecs = 1; @@ -1019,12 +991,7 @@ static int sof_audio_probe(struct platform_device *pdev) else if (sof_rt5682_quirk & SOF_RT1015P_SPEAKER_AMP_PRESENT) sof_rt1015p_codec_conf(&sof_audio_card_rt5682); else if (sof_rt5682_quirk & SOF_MAX98390_SPEAKER_AMP_PRESENT) { - if (sof_rt5682_quirk & SOF_MAX98390_TWEETER_SPEAKER_PRESENT) - max_98390_set_codec_conf(&sof_audio_card_rt5682, - ARRAY_SIZE(max_98390_4spk_components)); - else - max_98390_set_codec_conf(&sof_audio_card_rt5682, - ARRAY_SIZE(max_98390_components)); + max_98390_set_codec_conf(&sof_audio_card_rt5682); } if (sof_rt5682_quirk & SOF_SSP_BT_OFFLOAD_PRESENT)