From patchwork Tue Aug 3 09:20:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Hsieh X-Patchwork-Id: 490976 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0154EC4338F for ; Tue, 3 Aug 2021 10:15:06 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 24C1461037 for ; Tue, 3 Aug 2021 10:15:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 24C1461037 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=wistron.corp-partner.google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-project.org 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 00954172C; Tue, 3 Aug 2021 12:14:12 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 00954172C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1627985703; bh=uecRkhzFRdbJbeBQhFVm75yev5poE3yKgWUIXrVwhTQ=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=cBiSneTU5DKfErjzHAyHX3CmFylGwL/dmTubVWoI5Mg92nv3/o59B3O8HBcIYN9Sd Kr7CN0b12BMIU5sr65jEy67qYJzfuxI7k0p/3FUIZXC09DqizppCKVuiyxPh1M9Qto rI2o/BrCrT9WrhV+jOXfFUoL9voUwpSWMn59qa00= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 73CACF804E4; Tue, 3 Aug 2021 12:13:28 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 15BD1F802E8; Tue, 3 Aug 2021 11:21:06 +0200 (CEST) Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 0AE42F80095 for ; Tue, 3 Aug 2021 11:21:00 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 0AE42F80095 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=wistron-corp-partner-google-com.20150623.gappssmtp.com header.i=@wistron-corp-partner-google-com.20150623.gappssmtp.com header.b="pGtmmIDf" Received: by mail-pl1-x633.google.com with SMTP id c16so22922176plh.7 for ; Tue, 03 Aug 2021 02:21:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wistron-corp-partner-google-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=/rFmcgcm4hQ2h0tl29kMkZadCPDH7bgmFtfdjJ9aePg=; b=pGtmmIDfokSjxryZ/p4CkTvr/sWJ7bYJrrkSQ2MWqW3bcnbBMpOysXDqtN7ag0auPk yJ8lLY732mHihfFe4wi74qMcGzD5eiOu7H19hUfisyW/HxSYNQq49T0RbmmrbKrFHX7I C9ga7GXRYrXqvEYM/MuSPMJsyapJFHypnwyLSjsJvTiDyHRTssSN9dKgQzlNb+OnQtMe sbmPXvU+Yy1Q9r1Q7Hq4sMz6wcJEi4CNgeF7nCHpuiPrpU2mv32iILZ0aOTT4QovJoCt BjWoPFrOqClhRHWY96bUKSkNMFfs7TY+FN+cJ6FgIqjP8z0R1HgQ4ueNetXYRmLMrSC1 perA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=/rFmcgcm4hQ2h0tl29kMkZadCPDH7bgmFtfdjJ9aePg=; b=GykVOGP1CCdWAycPCISRuULEki0b7DsB6E1TMvYWpmMfcZaU7WTow343qJD/Znu9TH anbb9Hpn0yl+6i248DhQHhXop4d/0r8eEvi+EhnswCBEJX8NPu0+hJJpGtbaG5gOVgNn 5HrPnm/Tv4YBKXUfZhoL9teahPEsgH/X5lqsHZXfXmrxEnzqsA+WJRSjftbdeSa6FN7p Zt5ctEy4F0Hpgj8MCfGKk7RmLizZiNnYu+WsllON29vF4vvP+cfJF/YGkvRaifKB/yTW XJo9pXX0jsXciqDQtqW8ktW5+J7gIP8Aob9RER8sJeWYlC3q4PM715UiIkX1OI2n5wfe l8pA== X-Gm-Message-State: AOAM532DP3AQaXQT0gBUN0dBqAFsPouvPXOwGNPDUvYKPBrHa/lF93u2 gVpTfqJS6qmV8E0zeOL7EAUf/hT94IJb7xaC X-Google-Smtp-Source: ABdhPJximAivsC6Zmfv8exbTnPGtW+8XR6+ifjGidg15PTkVFlXRmV8Amsn0drbmAr0fkXdC6LpNGA== X-Received: by 2002:a65:520b:: with SMTP id o11mr2522987pgp.406.1627982458836; Tue, 03 Aug 2021 02:20:58 -0700 (PDT) Received: from localhost.localdomain ([2402:7500:4dd:3ed3:60f2:c71c:b30:a151]) by smtp.gmail.com with ESMTPSA id y9sm16257616pgr.10.2021.08.03.02.20.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Aug 2021 02:20:58 -0700 (PDT) From: Mark Hsieh To: alsa-devel@alsa-project.org Subject: [PATCH] ASoC: Intel: sof_rt5682: Add max98390 echo reference support Date: Tue, 3 Aug 2021 17:20:13 +0800 Message-Id: <20210803092013.10749-1-mark_hsieh@wistron.corp-partner.google.com> X-Mailer: git-send-email 2.17.1 X-Mailman-Approved-At: Tue, 03 Aug 2021 12:13:25 +0200 Cc: lance.hou@intel.com, cezary.rojewski@intel.com, mark_hsieh@wistron.com, kai.vehmanen@linux.intel.com, linux-kernel@vger.kernel.org, yang.jie@linux.intel.com, pierre-louis.bossart@linux.intel.com, Mark Hsieh , liam.r.girdwood@linux.intel.com, mac.chiang@intel.com, broonie@kernel.org, brent.lu@intel.com, bard.liao@intel.com 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" Signed-off-by: Mark Hsieh --- sound/soc/intel/boards/sof_maxim_common.c | 126 ++++++++++++++++++ sound/soc/intel/boards/sof_maxim_common.h | 15 +++ sound/soc/intel/boards/sof_rt5682.c | 43 +++++- .../intel/common/soc-acpi-intel-adl-match.c | 13 ++ 4 files changed, 196 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/boards/sof_maxim_common.c b/sound/soc/intel/boards/sof_maxim_common.c index e9c52f8b6428..179f1d12e1b8 100644 --- a/sound/soc/intel/boards/sof_maxim_common.c +++ b/sound/soc/intel/boards/sof_maxim_common.c @@ -11,6 +11,7 @@ #include "sof_maxim_common.h" #define MAX_98373_PIN_NAME 16 +#define MAX_98390_PIN_NAME 16 const struct snd_soc_dapm_route max_98373_dapm_routes[] = { /* speaker */ @@ -133,6 +134,131 @@ void max_98373_set_codec_conf(struct snd_soc_card *card) } EXPORT_SYMBOL_NS(max_98373_set_codec_conf, SND_SOC_INTEL_SOF_MAXIM_COMMON); +/* + * Maxim MAX98390 + */ + +const struct snd_soc_dapm_route max_98390_dapm_routes[] = { + /* speaker */ + { "Left Spk", NULL, "Left BE_OUT" }, + { "Right Spk", NULL, "Right BE_OUT" }, +}; +EXPORT_SYMBOL_NS(max_98390_dapm_routes, SND_SOC_INTEL_SOF_MAXIM_COMMON); + +static struct snd_soc_codec_conf max_98390_codec_conf[] = { + { + .dlc = COMP_CODEC_CONF(MAX_98390_DEV0_NAME), + .name_prefix = "Right", + }, + { + .dlc = COMP_CODEC_CONF(MAX_98390_DEV1_NAME), + .name_prefix = "Left", + }, +}; + +struct snd_soc_dai_link_component max_98390_components[] = { + { /* For Right */ + .name = MAX_98373_DEV0_NAME, + .dai_name = MAX_98390_CODEC_DAI, + }, + { /* For Left */ + .name = MAX_98373_DEV1_NAME, + .dai_name = MAX_98390_CODEC_DAI, + }, +}; +EXPORT_SYMBOL_NS(max_98390_components, SND_SOC_INTEL_SOF_MAXIM_COMMON); + +static int max_98390_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai; + int j; + + for_each_rtd_codec_dais(rtd, j, codec_dai) { + if (!strcmp(codec_dai->component->name, MAX_98390_DEV0_NAME)) { + /* DEV0 tdm slot configuration */ + snd_soc_dai_set_tdm_slot(codec_dai, 0x03, 3, 8, 32); + } + if (!strcmp(codec_dai->component->name, MAX_98390_DEV1_NAME)) { + /* DEV1 tdm slot configuration */ + snd_soc_dai_set_tdm_slot(codec_dai, 0x0C, 3, 8, 32); + } + } + return 0; +} + +int max_98390_trigger(struct snd_pcm_substream *substream, int cmd) +{ + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_dai *codec_dai; + struct snd_soc_dai *cpu_dai; + int j; + int ret = 0; + + /* set spk pin by playback only */ + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) + return 0; + + cpu_dai = asoc_rtd_to_cpu(rtd, 0); + for_each_rtd_codec_dais(rtd, j, codec_dai) { + struct snd_soc_dapm_context *dapm = + snd_soc_component_get_dapm(cpu_dai->component); + char pin_name[MAX_98390_PIN_NAME]; + + snprintf(pin_name, ARRAY_SIZE(pin_name), "%s Spk", + codec_dai->component->name_prefix); + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + ret = snd_soc_dapm_enable_pin(dapm, pin_name); + if (!ret) + snd_soc_dapm_sync(dapm); + break; + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + ret = snd_soc_dapm_disable_pin(dapm, pin_name); + if (!ret) + snd_soc_dapm_sync(dapm); + break; + default: + break; + } + } + + return ret; +} +EXPORT_SYMBOL_NS(max_98390_trigger, SND_SOC_INTEL_SOF_MAXIM_COMMON); + +struct snd_soc_ops max_98390_ops = { + .hw_params = max_98390_hw_params, + .trigger = max_98390_trigger, +}; +EXPORT_SYMBOL_NS(max_98390_ops, SND_SOC_INTEL_SOF_MAXIM_COMMON); + +int max_98390_spk_codec_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_card *card = rtd->card; + int ret; + + ret = snd_soc_dapm_add_routes(&card->dapm, max_98390_dapm_routes, + ARRAY_SIZE(max_98390_dapm_routes)); + if (ret) + dev_err(rtd->dev, "Speaker map addition failed: %d\n", ret); + return ret; +} +EXPORT_SYMBOL_NS(max_98390_spk_codec_init, SND_SOC_INTEL_SOF_MAXIM_COMMON); + +void max_98390_set_codec_conf(struct snd_soc_card *card) +{ + card->codec_conf = max_98390_codec_conf; + card->num_configs = ARRAY_SIZE(max_98390_codec_conf); +} +EXPORT_SYMBOL_NS(max_98390_set_codec_conf, SND_SOC_INTEL_SOF_MAXIM_COMMON); + /* * Maxim MAX98357A */ diff --git a/sound/soc/intel/boards/sof_maxim_common.h b/sound/soc/intel/boards/sof_maxim_common.h index 2674f1e373ef..e1ad25dfb915 100644 --- a/sound/soc/intel/boards/sof_maxim_common.h +++ b/sound/soc/intel/boards/sof_maxim_common.h @@ -24,6 +24,21 @@ int max_98373_spk_codec_init(struct snd_soc_pcm_runtime *rtd); void max_98373_set_codec_conf(struct snd_soc_card *card); int max_98373_trigger(struct snd_pcm_substream *substream, int cmd); +/* + * Maxim MAX98390 + */ +#define MAX_98390_CODEC_DAI "max98390-aif1" +#define MAX_98390_DEV0_NAME "i2c-MX98390:00" +#define MAX_98390_DEV1_NAME "i2c-MX98390:01" + +extern struct snd_soc_dai_link_component max_98390_components[2]; +extern struct snd_soc_ops max_98390_ops; +extern const struct snd_soc_dapm_route max_98390_dapm_routes[]; + +int max_98390_spk_codec_init(struct snd_soc_pcm_runtime *rtd); +void max_98390_set_codec_conf(struct snd_soc_card *card); +int max_98390_trigger(struct snd_pcm_substream *substream, int cmd); + /* * Maxim MAX98357A */ diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index 39217223d50c..ea4b8056db62 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -49,6 +49,7 @@ #define SOF_RT1015P_SPEAKER_AMP_PRESENT BIT(16) #define SOF_MAX98373_SPEAKER_AMP_PRESENT BIT(17) #define SOF_MAX98360A_SPEAKER_AMP_PRESENT BIT(18) +#define SOF_MAX98390_SPEAKER_AMP_PRESENT BIT(23) /* BT audio offload: reserve 3 bits for future */ #define SOF_BT_OFFLOAD_SSP_SHIFT 19 @@ -162,6 +163,19 @@ 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"), + }, + .driver_data = (void *)(SOF_RT5682_MCLK_EN | + SOF_RT5682_SSP_CODEC(0) | + SOF_SPEAKER_AMP_PRESENT | + SOF_MAX98390_SPEAKER_AMP_PRESENT | + SOF_RT5682_SSP_AMP(2) | + SOF_RT5682_NUM_HDMIDEV(4)), + }, {} }; @@ -445,6 +459,14 @@ static int sof_card_late_probe(struct snd_soc_card *card) if (err < 0) return err; } + if (sof_rt5682_quirk & SOF_MAX98390_SPEAKER_AMP_PRESENT) { + /* Disable Left and Right Spk pin after boot */ + snd_soc_dapm_disable_pin(dapm, "Left Spk"); + snd_soc_dapm_disable_pin(dapm, "Right Spk"); + err = snd_soc_dapm_sync(dapm); + if (err < 0) + return err; + } return hdac_hdmi_jack_port_init(component, &card->dapm); } @@ -781,6 +803,13 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, } else if (sof_rt5682_quirk & SOF_RT1011_SPEAKER_AMP_PRESENT) { sof_rt1011_dai_link(&links[id]); + } else if (sof_rt5682_quirk & + SOF_MAX98390_SPEAKER_AMP_PRESENT) { + 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; + links[id].dpcm_capture = 1; } else { max_98357a_dai_link(&links[id]); } @@ -917,7 +946,8 @@ static int sof_audio_probe(struct platform_device *pdev) sof_rt1011_codec_conf(&sof_audio_card_rt5682); 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) + max_98390_set_codec_conf(&sof_audio_card_rt5682); if (sof_rt5682_quirk & SOF_SSP_BT_OFFLOAD_PRESENT) sof_audio_card_rt5682.num_links++; @@ -1043,6 +1073,17 @@ 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(2) | + SOF_RT5682_NUM_HDMIDEV(4) | + SOF_BT_OFFLOAD_SSP(2) | + SOF_SSP_BT_OFFLOAD_PRESENT), + }, { } }; MODULE_DEVICE_TABLE(platform, board_ids); 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 a0f6a69c7038..2db152998e4a 100644 --- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c @@ -280,6 +280,11 @@ static const struct snd_soc_acpi_codecs adl_max98357a_amp = { .codecs = {"MX98357A"} }; +static const struct snd_soc_acpi_codecs adl_max98390_amp = { + .num_codecs = 1, + .codecs = {"MX98390"} +}; + struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { { .id = "10EC5682", @@ -297,6 +302,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { .sof_fw_filename = "sof-adl.ri", .sof_tplg_filename = "sof-adl-max98357a-rt5682.tplg", }, + { + .id = "10EC5682", + .drv_name = "adl_max98390_rt5682", + .machine_quirk = snd_soc_acpi_codec_list, + .quirk_data = &adl_max98390_amp, + .sof_fw_filename = "sof-adl.ri", + .sof_tplg_filename = "sof-adl-max98390-rt5682.tplg", + }, {}, }; EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_adl_machines);