From patchwork Fri Jun 16 06:36:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mac Chiang X-Patchwork-Id: 693272 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BD4DCEB64D7 for ; Fri, 16 Jun 2023 06:49:23 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 3F14F829; Fri, 16 Jun 2023 08:48:29 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 3F14F829 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1686898159; bh=r6LsE4QDPJaN7RaevDpadKMDhy3dpH8r4JpXYj/mSig=; h=From:To:Cc:Subject:Date:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=ex5mt/dqpLt/ezhDSiTygBEJsNv+bYeYVGk4tC4WfmUdpgXtyyGcP7wo14SJLOeCf It99XqB8Fs+OgzK6MOPKFpM9zdZTsqQ4+5y+PZrg6ASuojSPvA2hpSIm9NDTTjF/T/ W5STJgiBCeOGiyLQppgChmpiqMDMoIGnV9b3IhjA= Received: by alsa1.perex.cz (Postfix, from userid 50401) id E8C71F80544; Fri, 16 Jun 2023 08:48:03 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id BB813F80149; Fri, 16 Jun 2023 08:48:02 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 68FD5F80155; Fri, 16 Jun 2023 08:42:57 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 9ABB5F800BA for ; Fri, 16 Jun 2023 08:42:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9ABB5F800BA Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=EwAsCja8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686897770; x=1718433770; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=r6LsE4QDPJaN7RaevDpadKMDhy3dpH8r4JpXYj/mSig=; b=EwAsCja8QP2hZ0ZC9UspEwSlbNl7sT52IJHf+KKG3woFXNsnx3V18m6O 3fodwD+TSadI/c7DY69TmYD/cQSlBRbWMehh4sOIWmVK6k6H8WNNQdxU1 LNCrFHPYY9XHSwIQa4bGcmLLbTwY5JMxrc7FtsAD50i3yBBX3igz7Q9VO cATIn3MCQf8N5F6Y3qvvAftUEx8ymL2QQE3Z6EcpWjT1ZQIJwoLgQmEzc 9hA7ghVCxzlbiN9I0RK72TBOpsls7pZKmY5ExO87E8WeR8LyQWmzfL3o0 phqAvfASYvOAH2aT5ebcmidt/U4vMBAKdYHBNDOEy2WEMtmOza15EPIkA Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10742"; a="358017035" X-IronPort-AV: E=Sophos;i="6.00,246,1681196400"; d="scan'208";a="358017035" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2023 23:42:12 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10742"; a="746062639" X-IronPort-AV: E=Sophos;i="6.00,246,1681196400"; d="scan'208";a="746062639" Received: from macchian-builder.itwn.intel.com ([10.5.253.188]) by orsmga001.jf.intel.com with ESMTP; 15 Jun 2023 23:42:10 -0700 From: Mac Chiang To: broonie@kernel.org, tiwai@suse.de Cc: alsa-devel@alsa-project.org, pierre-louis.bossart@linux.intel.com, htcheong@chromium.org, zhourui@huaqin.corp-partner.google.com, bard.liao@intel.com, mac.chiang@intel.com Subject: [PATCH v2 1/2] ASoC: Intel: sof_rt5682: reorder quirk table Date: Fri, 16 Jun 2023 02:36:16 -0400 Message-Id: <20230616063617.25900-1-mac.chiang@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Message-ID-Hash: 3M5PRGDEQVMIFXSELEK3JCATOL2B6FLW X-Message-ID-Hash: 3M5PRGDEQVMIFXSELEK3JCATOL2B6FLW X-MailFrom: mac.chiang@intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Terry Cheong Reorder the entries in quirk table to group entries with same platform. Signed-off-by: Terry Cheong Signed-off-by: Mac Chiang --- For the purpose of rebasing PATCH 2/2, pick up from link:https://github.com/thesofproject/linux/pull/4419 Mainly pick up mtl_rt1019_rt5682 driver for Chrome projects support. Link:https://github.com/thesofproject/linux/pull/4417 Changes v2: - missing Signed-off-by in PATCH 1/2, added it. --- sound/soc/intel/boards/sof_rt5682.c | 52 ++++++++++++++--------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index 86bbc1fea6ff..be34d7595537 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -981,14 +981,13 @@ static const struct platform_device_id board_ids[] = { .name = "sof_rt5682", }, { - .name = "tgl_mx98357_rt5682", + .name = "cml_rt1015_rt5682", .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | + SOF_RT5682_MCLK_24MHZ | SOF_RT5682_SSP_CODEC(0) | SOF_SPEAKER_AMP_PRESENT | - SOF_RT5682_SSP_AMP(1) | - SOF_RT5682_NUM_HDMIDEV(4) | - SOF_BT_OFFLOAD_SSP(2) | - SOF_SSP_BT_OFFLOAD_PRESENT), + SOF_RT1015_SPEAKER_AMP_PRESENT | + SOF_RT5682_SSP_AMP(1)), }, { .name = "jsl_rt5682_rt1015", @@ -1000,33 +999,38 @@ static const struct platform_device_id board_ids[] = { SOF_RT5682_SSP_AMP(1)), }, { - .name = "tgl_mx98373_rt5682", + .name = "jsl_rt5682_mx98360", .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | + SOF_RT5682_MCLK_24MHZ | SOF_RT5682_SSP_CODEC(0) | SOF_SPEAKER_AMP_PRESENT | - SOF_MAX98373_SPEAKER_AMP_PRESENT | - SOF_RT5682_SSP_AMP(1) | - SOF_RT5682_NUM_HDMIDEV(4) | - SOF_BT_OFFLOAD_SSP(2) | - SOF_SSP_BT_OFFLOAD_PRESENT), + SOF_MAX98360A_SPEAKER_AMP_PRESENT | + SOF_RT5682_SSP_AMP(1)), }, { - .name = "jsl_rt5682_mx98360", + .name = "jsl_rt5682_rt1015p", .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | SOF_RT5682_MCLK_24MHZ | SOF_RT5682_SSP_CODEC(0) | SOF_SPEAKER_AMP_PRESENT | - SOF_MAX98360A_SPEAKER_AMP_PRESENT | + SOF_RT1015P_SPEAKER_AMP_PRESENT | SOF_RT5682_SSP_AMP(1)), }, { - .name = "cml_rt1015_rt5682", + .name = "jsl_rt5682", .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | SOF_RT5682_MCLK_24MHZ | + SOF_RT5682_SSP_CODEC(0)), + }, + { + .name = "tgl_mx98357_rt5682", + .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | SOF_RT5682_SSP_CODEC(0) | SOF_SPEAKER_AMP_PRESENT | - SOF_RT1015_SPEAKER_AMP_PRESENT | - SOF_RT5682_SSP_AMP(1)), + SOF_RT5682_SSP_AMP(1) | + SOF_RT5682_NUM_HDMIDEV(4) | + SOF_BT_OFFLOAD_SSP(2) | + SOF_SSP_BT_OFFLOAD_PRESENT), }, { .name = "tgl_rt1011_rt5682", @@ -1040,13 +1044,15 @@ static const struct platform_device_id board_ids[] = { SOF_SSP_BT_OFFLOAD_PRESENT), }, { - .name = "jsl_rt5682_rt1015p", + .name = "tgl_mx98373_rt5682", .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | - SOF_RT5682_MCLK_24MHZ | SOF_RT5682_SSP_CODEC(0) | SOF_SPEAKER_AMP_PRESENT | - SOF_RT1015P_SPEAKER_AMP_PRESENT | - SOF_RT5682_SSP_AMP(1)), + SOF_MAX98373_SPEAKER_AMP_PRESENT | + SOF_RT5682_SSP_AMP(1) | + SOF_RT5682_NUM_HDMIDEV(4) | + SOF_BT_OFFLOAD_SSP(2) | + SOF_SSP_BT_OFFLOAD_PRESENT), }, { .name = "adl_mx98373_rt5682", @@ -1149,12 +1155,6 @@ static const struct platform_device_id board_ids[] = { SOF_RT5682_SSP_AMP(1) | SOF_RT5682_NUM_HDMIDEV(4)), }, - { - .name = "jsl_rt5682", - .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | - SOF_RT5682_MCLK_24MHZ | - SOF_RT5682_SSP_CODEC(0)), - }, { } }; MODULE_DEVICE_TABLE(platform, board_ids); From patchwork Fri Jun 16 06:36:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mac Chiang X-Patchwork-Id: 694124 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9F386EB64D7 for ; Fri, 16 Jun 2023 06:49:47 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 51958820; Fri, 16 Jun 2023 08:48:55 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 51958820 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1686898185; bh=iWnJbgwh0T9lZF52oJFx/PfM6eCdscB/2fVbEaWlmmc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=uVMDG4/WVr22gzT+GV4AJztXpOWDlCSvZLtobFCSIa9YfptKFHGCjFro0HuGPvNGb 00hwcZZGIyN2jiNb/mt1KDHfWO4f6zbcMPIylrd6cKeDg3np2LYmG8iqtYjJx1rBG+ 2zdJLdTWaSiaXzhrP2SZtzl/F/p5kti4kfh+Mv+A= Received: by alsa1.perex.cz (Postfix, from userid 50401) id A8179F80548; Fri, 16 Jun 2023 08:48:05 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id EFAA2F80549; Fri, 16 Jun 2023 08:48:04 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B9765F80149; Fri, 16 Jun 2023 08:42:59 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id A72E3F80130 for ; Fri, 16 Jun 2023 08:42:51 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A72E3F80130 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=gwLLhaaT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686897772; x=1718433772; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=iWnJbgwh0T9lZF52oJFx/PfM6eCdscB/2fVbEaWlmmc=; b=gwLLhaaTgjv5JHqlJtJtAnCzfiIFwLVDeucwvylxRPyIA+6hd13YQIRJ ae4A/WK8Pvz3QjxFiUMjWGFGfitd7Y3tBmyNaBvp3VgWCNnPKkNz98gFX s5dmgMzR3SvwL+b6CQUJcRNxxCZxtfXIVi+Wm+OFTvR35Y7NH4EYpufDL X24qRw/Oz04tIroidKvuoORqjXECXVpZdrcFk6Kfp3DzUiR2Lb83qH+fM PSalJ8tS+bicz/ZlPh+l0UWgvsKVIqLlPbAGL+4WYIOif+uoUlC7sAMJR ZVzzBI2sus/9HvquAMO+2Wk1obHyXPwhPDfhylXbHR540z1hR7SHq2LAk g==; X-IronPort-AV: E=McAfee;i="6600,9927,10742"; a="358017079" X-IronPort-AV: E=Sophos;i="6.00,246,1681196400"; d="scan'208";a="358017079" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2023 23:42:14 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10742"; a="746062653" X-IronPort-AV: E=Sophos;i="6.00,246,1681196400"; d="scan'208";a="746062653" Received: from macchian-builder.itwn.intel.com ([10.5.253.188]) by orsmga001.jf.intel.com with ESMTP; 15 Jun 2023 23:42:12 -0700 From: Mac Chiang To: broonie@kernel.org, tiwai@suse.de Cc: alsa-devel@alsa-project.org, pierre-louis.bossart@linux.intel.com, htcheong@chromium.org, zhourui@huaqin.corp-partner.google.com, bard.liao@intel.com, mac.chiang@intel.com Subject: [PATCH v2 2/2] ASoC: Intel: sof_rt5682: Add mtl support RT1019P speaker Date: Fri, 16 Jun 2023 02:36:17 -0400 Message-Id: <20230616063617.25900-2-mac.chiang@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230616063617.25900-1-mac.chiang@intel.com> References: <20230616063617.25900-1-mac.chiang@intel.com> MIME-Version: 1.0 Message-ID-Hash: VZSO23RZNGKM5245HG5CIHGQQ7OGCG5C X-Message-ID-Hash: VZSO23RZNGKM5245HG5CIHGQQ7OGCG5C X-MailFrom: mac.chiang@intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This patch support below hardware configuration: SSP2: 10EC5682/RTL5682 codec SSP0: RTL1019 amplifier Signed-off-by: Mac Chiang Signed-off-by: Rui Zhou --- sound/soc/intel/boards/sof_rt5682.c | 23 +++++++++++++++++++ .../intel/common/soc-acpi-intel-mtl-match.c | 12 ++++++++++ 2 files changed, 35 insertions(+) diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index be34d7595537..7c034d671cf3 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -239,6 +239,20 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = { SOF_SSP_BT_OFFLOAD_PRESENT ), }, + { + .callback = sof_rt5682_quirk_cb, + .matches = { + DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Rex"), + DMI_MATCH(DMI_OEM_STRING, "AUDIO-ALC1019_ALC5682I_I2S"), + }, + .driver_data = (void *)(SOF_RT5682_MCLK_EN | + SOF_RT5682_SSP_CODEC(2) | + SOF_SPEAKER_AMP_PRESENT | + SOF_RT1019_SPEAKER_AMP_PRESENT | + SOF_RT5682_SSP_AMP(0) | + SOF_RT5682_NUM_HDMIDEV(3) + ), + }, { .callback = sof_rt5682_quirk_cb, .matches = { @@ -1155,6 +1169,15 @@ static const struct platform_device_id board_ids[] = { SOF_RT5682_SSP_AMP(1) | SOF_RT5682_NUM_HDMIDEV(4)), }, + { + .name = "mtl_rt1019_rt5682", + .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | + SOF_RT5682_SSP_CODEC(2) | + SOF_SPEAKER_AMP_PRESENT | + SOF_RT1019_SPEAKER_AMP_PRESENT | + SOF_RT5682_SSP_AMP(0) | + SOF_RT5682_NUM_HDMIDEV(3)), + }, { } }; MODULE_DEVICE_TABLE(platform, board_ids); diff --git a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c index 3d5cf8867926..ed9821adc1d9 100644 --- a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c @@ -20,6 +20,11 @@ static const struct snd_soc_acpi_codecs mtl_max98360a_amp = { .codecs = {"MX98360A"} }; +static const struct snd_soc_acpi_codecs mtl_rt1019p_amp = { + .num_codecs = 1, + .codecs = {"RTL1019"} +}; + static const struct snd_soc_acpi_codecs mtl_rt5682_rt5682s_hp = { .num_codecs = 2, .codecs = {"10EC5682", "RTL5682"}, @@ -40,6 +45,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[] = { .quirk_data = &mtl_max98360a_amp, .sof_tplg_filename = "sof-mtl-max98360a-rt5682.tplg", }, + { + .comp_ids = &mtl_rt5682_rt5682s_hp, + .drv_name = "mtl_rt1019_rt5682", + .machine_quirk = snd_soc_acpi_codec_list, + .quirk_data = &mtl_rt1019p_amp, + .sof_tplg_filename = "sof-mtl-rt1019-rt5682.tplg", + }, {}, }; EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_mtl_machines);