From patchwork Wed Oct 26 07:14:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brent Lu X-Patchwork-Id: 13020249 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 6300DC433FE for ; Wed, 26 Oct 2022 07:19:05 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 69A82412C; Wed, 26 Oct 2022 09:18:13 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 69A82412C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1666768743; bh=75HpJEzPLn8A5CbuFT1/YZ3tvDRbc53NHO6Z7uVHf2U=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=ZGkNYSDIr+YZ2AyUtvNJzStn7JBAL2ZyBq5tG6hrZoE6J8APeRFkscD5guWbJH5p2 H0DedZl3si/fNC0PCsqg7lKku9S+FKTFV/fp3FFspYpaYsyyp5IELZ1wizseurt6ht NhsCNjevzfZjY6nI6Onh3ckOMge4ImRbNBW1rgMk= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 4E203F803DC; Wed, 26 Oct 2022 09:17:32 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 0A2A3F803DC; Wed, 26 Oct 2022 09:17:29 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 15C54F80100 for ; Wed, 26 Oct 2022 09:17:20 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 15C54F80100 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="UugYRxy4" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666768642; x=1698304642; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=75HpJEzPLn8A5CbuFT1/YZ3tvDRbc53NHO6Z7uVHf2U=; b=UugYRxy45J1rg9K1flper3IxYmRni1nFimGV32nvj2H6I0tfaFXuwdT1 NN2D1cOq5xQyY2VpZ3oujQL/GzozwYYFrwJK2bdMSrWxZUj7t9W8AAOVm Bc7bOf0pkHilcRysRtL0Qj0uzMmN97ZFzo8zf/b6BRieucVhJ2KmbQ8QP 2tbevPowfOmDsHpSQyiWqsa0GPWleBE03hqLX8xmsnKKjS4m173MZcBrZ HG6kUeoSczbp68DV9/149jnP3GaLZGeWueeLj5AIWxJCkoOJuvvZvfGgL ZBLsKRLBPlZWYIdNB0FGoxu+jdjSYQozmSTZC1dwP2iAd30EgMEZ+WEqR A==; X-IronPort-AV: E=McAfee;i="6500,9779,10511"; a="287596238" X-IronPort-AV: E=Sophos;i="5.95,213,1661842800"; d="scan'208";a="287596238" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Oct 2022 00:17:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10511"; a="663096939" X-IronPort-AV: E=Sophos;i="5.95,213,1661842800"; d="scan'208";a="663096939" Received: from brentlu-brix.itwn.intel.com ([10.5.253.25]) by orsmga008.jf.intel.com with ESMTP; 26 Oct 2022 00:17:02 -0700 From: Brent Lu To: alsa-devel@alsa-project.org Subject: [PATCH 2/2] ASoC: Intel: sof_rt5682: quirk auto detection Date: Wed, 26 Oct 2022 15:14:09 +0800 Message-Id: <20221026071409.3235144-3-brent.lu@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221026071409.3235144-1-brent.lu@intel.com> References: <20221026071409.3235144-1-brent.lu@intel.com> MIME-Version: 1.0 Cc: "balamurugan . c" , Cezary Rojewski , Chao Song , Kai Vehmanen , Rander Wang , Bard Liao , Takashi Iwai , Pierre-Louis Bossart , Gongjun Song , linux-kernel@vger.kernel.org, Liam Girdwood , Mac Chiang , Mark Brown , Muralidhar Reddy , Ranjani Sridharan , Ajye Huang , Peter Ujfalusi , Brent Lu , Vamshi Krishna , Yong Zhi X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" To get rid of increasing board_ids array with similar quirks for every new platform, we implement a special board config 'sof_rt5682_auto' to compose quirk value at runtime. It detects SoC and amplifier type to determine the quirk value. Signed-off-by: Brent Lu --- sound/soc/intel/boards/sof_rt5682.c | 173 +++++++----------- .../intel/common/soc-acpi-intel-adl-match.c | 12 +- .../intel/common/soc-acpi-intel-jsl-match.c | 6 +- .../intel/common/soc-acpi-intel-tgl-match.c | 6 +- 4 files changed, 77 insertions(+), 120 deletions(-) diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index 2358be208c1f..2dfccbaae53c 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -60,6 +60,7 @@ #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_RT5682_AUTO_DETECT BIT(27) /* Default: MCLK on, MCLK 19.2M, SSP0 */ @@ -838,6 +839,65 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, return NULL; } +static const struct { + const u8 id[ACPI_ID_LEN]; + unsigned long quirk; +} spk_quirk_map[] = { + {.id = "10EC1011", .quirk = SOF_RT1011_SPEAKER_AMP_PRESENT}, + {.id = "10EC1015", .quirk = SOF_RT1015_SPEAKER_AMP_PRESENT}, + {.id = "RTL1015", .quirk = SOF_RT1015P_SPEAKER_AMP_PRESENT}, + {.id = "RTL1019", .quirk = SOF_RT1019_SPEAKER_AMP_PRESENT}, + {.id = "MX98357A", .quirk = 0}, + {.id = "MX98360A", .quirk = SOF_MAX98360A_SPEAKER_AMP_PRESENT}, + {.id = "MX98373", .quirk = SOF_MAX98373_SPEAKER_AMP_PRESENT}, + {.id = "MX98390", .quirk = SOF_MAX98390_SPEAKER_AMP_PRESENT}, +}; + +static unsigned long sof_audio_auto_detect(struct device *dev) +{ + unsigned long quirk = 0; + int i; + + for (i = 0; i < ARRAY_SIZE(spk_quirk_map); i++) { + if (!acpi_dev_present(spk_quirk_map[i].id, NULL, -1)) + continue; + + dev_dbg(dev, "%s detected\n", spk_quirk_map[i].id); + quirk |= spk_quirk_map[i].quirk; + quirk |= SOF_SPEAKER_AMP_PRESENT; + break; + } + + if (soc_intel_is_jsl()) { + quirk |= SOF_RT5682_MCLK_EN | + SOF_RT5682_MCLK_24MHZ | + SOF_RT5682_NUM_HDMIDEV(3) | + SOF_RT5682_SSP_CODEC(0); + + if (quirk & SOF_SPEAKER_AMP_PRESENT) + quirk |= SOF_RT5682_SSP_AMP(1); + } else if (soc_intel_is_tgl()) { + quirk |= SOF_RT5682_MCLK_EN | + SOF_RT5682_NUM_HDMIDEV(4) | + SOF_RT5682_SSP_CODEC(0); + + if (quirk & SOF_SPEAKER_AMP_PRESENT) + quirk |= SOF_RT5682_SSP_AMP(1); + } else if (soc_intel_is_adl() || soc_intel_is_adl_n()) { + quirk |= SOF_RT5682_MCLK_EN | + SOF_RT5682_NUM_HDMIDEV(4) | + SOF_RT5682_SSP_CODEC(0) | + SOF_BT_OFFLOAD_SSP(2) | + SOF_SSP_BT_OFFLOAD_PRESENT; + + if (quirk & SOF_SPEAKER_AMP_PRESENT) + quirk |= SOF_RT5682_SSP_AMP(1); + } else + dev_err(dev, "Auto-detect failed due to unknown platform\n"); + + return quirk; +} + static int sof_audio_probe(struct platform_device *pdev) { struct snd_soc_dai_link *dai_links; @@ -855,6 +915,9 @@ static int sof_audio_probe(struct platform_device *pdev) dmi_check_system(sof_rt5682_quirk_table); + if (sof_rt5682_quirk & SOF_RT5682_AUTO_DETECT) + sof_rt5682_quirk |= sof_audio_auto_detect(&pdev->dev); + mach = pdev->dev.platform_data; /* A speaker amp might not be present when the quirk claims one is. @@ -975,43 +1038,8 @@ static const struct platform_device_id board_ids[] = { .name = "sof_rt5682", }, { - .name = "tgl_mx98357_rt5682", - .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | - 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), - }, - { - .name = "jsl_rt5682_rt1015", - .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | - SOF_RT5682_MCLK_24MHZ | - SOF_RT5682_SSP_CODEC(0) | - SOF_SPEAKER_AMP_PRESENT | - SOF_RT1015_SPEAKER_AMP_PRESENT | - SOF_RT5682_SSP_AMP(1)), - }, - { - .name = "tgl_mx98373_rt5682", - .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | - 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), - }, - { - .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_MAX98360A_SPEAKER_AMP_PRESENT | - SOF_RT5682_SSP_AMP(1)), + .name = "sof_rt5682_auto", + .driver_data = (kernel_ulong_t)(SOF_RT5682_AUTO_DETECT), }, { .name = "cml_rt1015_rt5682", @@ -1022,37 +1050,6 @@ static const struct platform_device_id board_ids[] = { SOF_RT1015_SPEAKER_AMP_PRESENT | SOF_RT5682_SSP_AMP(1)), }, - { - .name = "tgl_rt1011_rt5682", - .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | - SOF_RT5682_SSP_CODEC(0) | - SOF_SPEAKER_AMP_PRESENT | - SOF_RT1011_SPEAKER_AMP_PRESENT | - SOF_RT5682_SSP_AMP(1) | - SOF_RT5682_NUM_HDMIDEV(4) | - SOF_BT_OFFLOAD_SSP(2) | - SOF_SSP_BT_OFFLOAD_PRESENT), - }, - { - .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_RT1015P_SPEAKER_AMP_PRESENT | - SOF_RT5682_SSP_AMP(1)), - }, - { - .name = "adl_mx98373_rt5682", - .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | - 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), - }, { .name = "adl_mx98357_rt5682", .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | @@ -1061,46 +1058,6 @@ static const struct platform_device_id board_ids[] = { SOF_RT5682_SSP_AMP(2) | SOF_RT5682_NUM_HDMIDEV(4)), }, - { - .name = "adl_max98390_rt5682", - .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | - SOF_RT5682_SSP_CODEC(0) | - SOF_SPEAKER_AMP_PRESENT | - SOF_MAX98390_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_mx98360_rt5682", - .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | - SOF_RT5682_SSP_CODEC(0) | - SOF_SPEAKER_AMP_PRESENT | - SOF_MAX98360A_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_rt5682", - .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | - SOF_RT5682_SSP_CODEC(0) | - SOF_RT5682_NUM_HDMIDEV(4) | - SOF_BT_OFFLOAD_SSP(2) | - SOF_SSP_BT_OFFLOAD_PRESENT), - }, - { - .name = "adl_rt1019_rt5682s", - .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | - SOF_RT5682_SSP_CODEC(0) | - SOF_RT5682S_HEADPHONE_CODEC_PRESENT | - SOF_SPEAKER_AMP_PRESENT | - SOF_RT1019_SPEAKER_AMP_PRESENT | - SOF_RT5682_SSP_AMP(1) | - SOF_RT5682_NUM_HDMIDEV(4)), - }, { .name = "mtl_mx98357_rt5682", .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c index 9990d5502d26..598e3d493369 100644 --- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c @@ -448,7 +448,7 @@ static const struct snd_soc_acpi_codecs adl_lt6911_hdmi = { struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { { .comp_ids = &adl_rt5682_rt5682s_hp, - .drv_name = "adl_mx98373_rt5682", + .drv_name = "sof_rt5682_auto", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &adl_max98373_amp, .sof_tplg_filename = "sof-adl-max98373-rt5682.tplg", @@ -462,7 +462,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { }, { .comp_ids = &adl_rt5682_rt5682s_hp, - .drv_name = "adl_mx98360_rt5682", + .drv_name = "sof_rt5682_auto", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &adl_max98360a_amp, .sof_tplg_filename = "sof-adl-max98360a-rt5682.tplg", @@ -489,8 +489,8 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { .sof_tplg_filename = "sof-adl-max98360a-nau8825.tplg", }, { - .id = "RTL5682", - .drv_name = "adl_rt1019_rt5682s", + .comp_ids = &adl_rt5682_rt5682s_hp, + .drv_name = "sof_rt5682_auto", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &adl_rt1019p_amp, .sof_tplg_filename = "sof-adl-rt1019-rt5682.tplg", @@ -502,14 +502,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { }, { .comp_ids = &adl_rt5682_rt5682s_hp, - .drv_name = "adl_max98390_rt5682", + .drv_name = "sof_rt5682_auto", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &adl_max98390_amp, .sof_tplg_filename = "sof-adl-max98390-rt5682.tplg", }, { .comp_ids = &adl_rt5682_rt5682s_hp, - .drv_name = "adl_rt5682", + .drv_name = "sof_rt5682_auto", .sof_tplg_filename = "sof-adl-rt5682.tplg", }, { diff --git a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c index b95c4b2cda94..1b7e56fa9211 100644 --- a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c @@ -59,21 +59,21 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = { }, { .comp_ids = &rt5682_rt5682s_hp, - .drv_name = "jsl_rt5682_rt1015", + .drv_name = "sof_rt5682_auto", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &rt1015_spk, .sof_tplg_filename = "sof-jsl-rt5682-rt1015.tplg", }, { .comp_ids = &rt5682_rt5682s_hp, - .drv_name = "jsl_rt5682_rt1015p", + .drv_name = "sof_rt5682_auto", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &rt1015p_spk, .sof_tplg_filename = "sof-jsl-rt5682-rt1015.tplg", }, { .comp_ids = &rt5682_rt5682s_hp, - .drv_name = "jsl_rt5682_mx98360", + .drv_name = "sof_rt5682_auto", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &mx98360a_spk, .sof_tplg_filename = "sof-jsl-rt5682-mx98360a.tplg", diff --git a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c index ef19150e7b2e..b882deedfab4 100644 --- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c @@ -376,21 +376,21 @@ static const struct snd_soc_acpi_codecs tgl_lt6911_hdmi = { struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = { { .comp_ids = &tgl_rt5682_rt5682s_hp, - .drv_name = "tgl_mx98357_rt5682", + .drv_name = "sof_rt5682_auto", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &tgl_codecs, .sof_tplg_filename = "sof-tgl-max98357a-rt5682.tplg", }, { .comp_ids = &tgl_rt5682_rt5682s_hp, - .drv_name = "tgl_mx98373_rt5682", + .drv_name = "sof_rt5682_auto", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &tgl_max98373_amp, .sof_tplg_filename = "sof-tgl-max98373-rt5682.tplg", }, { .comp_ids = &tgl_rt5682_rt5682s_hp, - .drv_name = "tgl_rt1011_rt5682", + .drv_name = "sof_rt5682_auto", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &tgl_rt1011_amp, .sof_tplg_filename = "sof-tgl-rt1011-rt5682.tplg",