From mboxrd@z Thu Jan 1 00:00:00 1970 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=-12.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, USER_AGENT_GIT autolearn=ham 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 4A062C47085 for ; Sun, 23 May 2021 23:45:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0E4C7611ED for ; Sun, 23 May 2021 23:45:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232107AbhEWXqe (ORCPT ); Sun, 23 May 2021 19:46:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232073AbhEWXqc (ORCPT ); Sun, 23 May 2021 19:46:32 -0400 Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD5F8C06138C; Sun, 23 May 2021 16:45:03 -0700 (PDT) Received: by mail-lj1-x22b.google.com with SMTP id t17so14480566ljd.9; Sun, 23 May 2021 16:45:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/lnkbAwGfOTfE0faI+z2uEvnE5UMJQap5u4jnvd3/0c=; b=IJA0RuH/sxS2Z+PU8lnm6gg+AWa/osTuuDRLJBja5ZoFA/Rc0S+ZwBtUg3qXdDpVBr 5p+HtqqpAvYYWbfD6yEZ2HkFsXyGeAFoM3Wl9wiEFPDWsU6bTX6rmRy/swrN9QMYao+W C8BpL+mkpawvSfh9Phg6zRVSs7ksdmWh7fXp1dpgfKGbWU14aXvvxbkVBMCmgqj2gafh RMzK0def2t0xL+uiy1NFRU5l3USxqw60mG8iasWkM6z4nwwKuUfoynXDTec6T9vh6gun gLMPVmOgMmio00vgbLkh3Nx0ku2iEjnkmi88G7KwNyp/kGhkUQw+WSljXtD7ZJMhu75u U0Rw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=/lnkbAwGfOTfE0faI+z2uEvnE5UMJQap5u4jnvd3/0c=; b=XowYkX7t2bkGupzOPuYpmCeoVO2YNKH5AKcNVCkn0K9PZGX+nOfuDbIH6uVrYvOq9X iJcAZpvCR1JQMIZjmc1z9MOKQDlzF5mfHNYsZhC5Dg7EOAB4jmYRA918AMXEzeNQ28yA hnhXdFGB8aYkrQbcNcyYxqnqdHniIgxky0+8DJbfHtwsAiFBdw8Uo019AH3+aT6oYHp+ W8O3s+UxZRzn74oT0quGUfyZrxAgG3zp7L4XP0HrLiOjWNt/fX8+wtNzalYJDaQJaGTb 1N09bCLaVBarDnj8/tsojByqIu7IgWYFIC+1l/JOTv0V3VDdWSL+k5fY4hg54ae0e+Nt CjXg== X-Gm-Message-State: AOAM533VBwhTuxmLuUQRLnOSNnsJieW/ro6rw90ES7pb383qvNulg2oT Phgpk1sA9KKkNwrQ/hDcYnU= X-Google-Smtp-Source: ABdhPJzkNA0BZJDWAFB/SC7LMu5UUqSITysCieeLViToB3wz26EiSa2n/a1EqfTgwH9wnsir3JLQbw== X-Received: by 2002:a2e:9cc:: with SMTP id 195mr14750317ljj.291.1621813502210; Sun, 23 May 2021 16:45:02 -0700 (PDT) Received: from localhost.localdomain (109-252-193-110.dynamic.spd-mgts.ru. [109.252.193.110]) by smtp.gmail.com with ESMTPSA id u11sm1269054lfg.243.2021.05.23.16.45.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 May 2021 16:45:02 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , Mark Brown , Takashi Iwai , Jaroslav Kysela , Ion Agorria , Svyatoslav Ryhel , Liam Girdwood Cc: alsa-devel@alsa-project.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/4] ASoC: tegra: Specify components string for Nexus 7 Date: Mon, 24 May 2021 02:44:37 +0300 Message-Id: <20210523234437.25077-5-digetx@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210523234437.25077-1-digetx@gmail.com> References: <20210523234437.25077-1-digetx@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Specify components string for Nexus 7 using the Intel BayTrail components format. This may allow us to create a more generic UCM for RT5640 codec. Signed-off-by: Dmitry Osipenko --- sound/soc/tegra/tegra_asoc_machine.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/sound/soc/tegra/tegra_asoc_machine.c b/sound/soc/tegra/tegra_asoc_machine.c index a81f2ebfc00c..87e0a47040a5 100644 --- a/sound/soc/tegra/tegra_asoc_machine.c +++ b/sound/soc/tegra/tegra_asoc_machine.c @@ -671,6 +671,24 @@ static const struct tegra_asoc_data tegra_rt5640_data = { .add_hp_jack = true, }; +/* + * Speaker: Connected to SPO L/R P/N pins, stereo. + * Internal Microphone: Digital, connected to DMIC1_DAT IN2P/N pins. + * Headphones: Connected to HPOL/R pins. + * Headset Microphone: Unconnected. + * + * IF2_DAC/ADC are unpopulated. + */ +static const struct tegra_asoc_data tegra_rt5640_grouper_data = { + .components = "codec:rt5640 cfg-spk:2 cfg-mic:dmic1 aif:1", + .mclk_rate = tegra_machine_mclk_rate_256, + .card = &snd_soc_tegra_rt5640, + .add_common_dapm_widgets = true, + .add_common_controls = true, + .add_common_snd_ops = true, + .add_hp_jack = true, +}; + /* RT5632 machine */ SND_SOC_DAILINK_DEFS(rt5632_hifi, @@ -712,6 +730,7 @@ static const struct of_device_id tegra_machine_of_match[] = { { .compatible = "nvidia,tegra-audio-wm8753", .data = &tegra_wm8753_data }, { .compatible = "nvidia,tegra-audio-rt5677", .data = &tegra_rt5677_data }, { .compatible = "nvidia,tegra-audio-rt5640", .data = &tegra_rt5640_data }, + { .compatible = "nvidia,tegra-audio-rt5640-grouper", .data = &tegra_rt5640_grouper_data }, { .compatible = "nvidia,tegra-audio-alc5632", .data = &tegra_rt5632_data }, {}, }; -- 2.30.2 From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.9 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,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 14058C47082 for ; Sun, 23 May 2021 23:48:12 +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 872CB611CB for ; Sun, 23 May 2021 23:48:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 872CB611CB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@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 CB343167B; Mon, 24 May 2021 01:47:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CB343167B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1621813689; bh=yQKHwEJzaLz0gmkUlvWUy4i9UmuBoOzkMP8NDDj12zI=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=hNqBoRSvKQxqitDyLQfeqNOpl3Q+NNpCxncYaigZ5AG9BNAR7wkbAyuxKBABKzCdR AopZ4MGyRKH0h4aGLdqWGOXw6sAXkZhVS4Qa2ZjHp3nR7STMEowArmGSoVDbwHWVP4 WBz1HawbPuE2WhZNVW1yJHoEKqHIVkUdeYBr8ZVo= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id DFBF9F8016D; Mon, 24 May 2021 01:45:59 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 89D90F804BD; Mon, 24 May 2021 01:45:58 +0200 (CEST) Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) (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 357B4F8016D for ; Mon, 24 May 2021 01:45:03 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 357B4F8016D Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IJA0RuH/" Received: by mail-lj1-x22a.google.com with SMTP id f12so31212688ljp.2 for ; Sun, 23 May 2021 16:45:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/lnkbAwGfOTfE0faI+z2uEvnE5UMJQap5u4jnvd3/0c=; b=IJA0RuH/sxS2Z+PU8lnm6gg+AWa/osTuuDRLJBja5ZoFA/Rc0S+ZwBtUg3qXdDpVBr 5p+HtqqpAvYYWbfD6yEZ2HkFsXyGeAFoM3Wl9wiEFPDWsU6bTX6rmRy/swrN9QMYao+W C8BpL+mkpawvSfh9Phg6zRVSs7ksdmWh7fXp1dpgfKGbWU14aXvvxbkVBMCmgqj2gafh RMzK0def2t0xL+uiy1NFRU5l3USxqw60mG8iasWkM6z4nwwKuUfoynXDTec6T9vh6gun gLMPVmOgMmio00vgbLkh3Nx0ku2iEjnkmi88G7KwNyp/kGhkUQw+WSljXtD7ZJMhu75u U0Rw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=/lnkbAwGfOTfE0faI+z2uEvnE5UMJQap5u4jnvd3/0c=; b=L6ZDTqwp5z6R+iOVFHDeEFXixj6SVxApTfRI5RKU5aTOIX7BVsFs/BZkoaQlJB3Yep UATiwHSeCmG5qIxiDGm5MnI4PpXcqZWeO+xFoVUCEyNf/Q4S/UHk+k0GmwcEZa6E8mH4 F3zCDZ/IELTVj7CyV2Cgfz4IevkOlVq04G2jCgZwVj6OUGZobEiJjnwjEOqUbmRQKgjd x5lyctOinVpvd5U7mvpd/Seji8pk5eKHVl5KXtY/BSj+RE+6Ao/Oc4NXPsRyu1Cik14u OC6C+GHFAGLKNnRpMpjigV6SaeSb/pqpuVM4JDOzcyTk7lUxjVVJBmdyd/SrzqToMmW7 EFTA== X-Gm-Message-State: AOAM533QRB1aYPV9Fwaos7JRI0IcJTIhg3CRNzYDlV8sx3JBN2tocu6/ 3jogBwVc9rVdNXacGcRFs1k= X-Google-Smtp-Source: ABdhPJzkNA0BZJDWAFB/SC7LMu5UUqSITysCieeLViToB3wz26EiSa2n/a1EqfTgwH9wnsir3JLQbw== X-Received: by 2002:a2e:9cc:: with SMTP id 195mr14750317ljj.291.1621813502210; Sun, 23 May 2021 16:45:02 -0700 (PDT) Received: from localhost.localdomain (109-252-193-110.dynamic.spd-mgts.ru. [109.252.193.110]) by smtp.gmail.com with ESMTPSA id u11sm1269054lfg.243.2021.05.23.16.45.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 May 2021 16:45:02 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , Mark Brown , Takashi Iwai , Jaroslav Kysela , Ion Agorria , Svyatoslav Ryhel , Liam Girdwood Subject: [PATCH v3 4/4] ASoC: tegra: Specify components string for Nexus 7 Date: Mon, 24 May 2021 02:44:37 +0300 Message-Id: <20210523234437.25077-5-digetx@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210523234437.25077-1-digetx@gmail.com> References: <20210523234437.25077-1-digetx@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Cc: linux-tegra@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org 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" Specify components string for Nexus 7 using the Intel BayTrail components format. This may allow us to create a more generic UCM for RT5640 codec. Signed-off-by: Dmitry Osipenko --- sound/soc/tegra/tegra_asoc_machine.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/sound/soc/tegra/tegra_asoc_machine.c b/sound/soc/tegra/tegra_asoc_machine.c index a81f2ebfc00c..87e0a47040a5 100644 --- a/sound/soc/tegra/tegra_asoc_machine.c +++ b/sound/soc/tegra/tegra_asoc_machine.c @@ -671,6 +671,24 @@ static const struct tegra_asoc_data tegra_rt5640_data = { .add_hp_jack = true, }; +/* + * Speaker: Connected to SPO L/R P/N pins, stereo. + * Internal Microphone: Digital, connected to DMIC1_DAT IN2P/N pins. + * Headphones: Connected to HPOL/R pins. + * Headset Microphone: Unconnected. + * + * IF2_DAC/ADC are unpopulated. + */ +static const struct tegra_asoc_data tegra_rt5640_grouper_data = { + .components = "codec:rt5640 cfg-spk:2 cfg-mic:dmic1 aif:1", + .mclk_rate = tegra_machine_mclk_rate_256, + .card = &snd_soc_tegra_rt5640, + .add_common_dapm_widgets = true, + .add_common_controls = true, + .add_common_snd_ops = true, + .add_hp_jack = true, +}; + /* RT5632 machine */ SND_SOC_DAILINK_DEFS(rt5632_hifi, @@ -712,6 +730,7 @@ static const struct of_device_id tegra_machine_of_match[] = { { .compatible = "nvidia,tegra-audio-wm8753", .data = &tegra_wm8753_data }, { .compatible = "nvidia,tegra-audio-rt5677", .data = &tegra_rt5677_data }, { .compatible = "nvidia,tegra-audio-rt5640", .data = &tegra_rt5640_data }, + { .compatible = "nvidia,tegra-audio-rt5640-grouper", .data = &tegra_rt5640_grouper_data }, { .compatible = "nvidia,tegra-audio-alc5632", .data = &tegra_rt5632_data }, {}, }; -- 2.30.2