From patchwork Sun Oct 24 19:28:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 12580413 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D608C433F5 for ; Sun, 24 Oct 2021 19:31:04 +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 EAA2A6103D for ; Sun, 24 Oct 2021 19:31:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org EAA2A6103D 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-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 5F1A0165D; Sun, 24 Oct 2021 21:30:10 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 5F1A0165D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1635103860; bh=b4xL0fAZ7re1f6p4MOs3gQ/SpyfAG14POALtZXQ49uY=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=q/oBKSZf/HO69FdIQ3QK4oH0MeUDKqQhGygHOgK7D36vCB0QOvUmqp9scj4S1Dw16 GSOeCUWJbUc3ZAZxf5/TDZHaOiPHA6bnz/AvnUMSIaqR/THzck99cC+imE0jE++QGN F9AUgB/ycakFslGBPZl1CSHQuqa1S292ltdXGxAg= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id D39C6F80269; Sun, 24 Oct 2021 21:30:09 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id DF85EF80300; Sun, 24 Oct 2021 21:30:06 +0200 (CEST) Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) (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 74236F80166 for ; Sun, 24 Oct 2021 21:29:59 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 74236F80166 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DV+dcYL3" Received: by mail-lf1-x12b.google.com with SMTP id u21so8609941lff.8 for ; Sun, 24 Oct 2021 12:29:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KuWfVJmwiYFrjBYD5I8hPFxxzsgnJfeoN2PJ/5VwVFo=; b=DV+dcYL3tCQ7pZQBBoGyJIzfKEiIOS4K/M2JDQH0hHHWhOXQmpoLKrkVY0d7carPZH 4b5yIMH5NmePlmnJnMpuXGXOHD6Q+Q15j5rFgci0sL7loM/ti27NnufY2rNcGIRNKXIx XBclvZ6LjxuTxSM2vphWK6g6HSzHv6WwFmvU7PdxlQGEtN6georbm/6cNAuQxF3Vnnwc /iasdD1mJ1fjrHhHdGfzmzAffccAEGksHgAt2EfEg/ckwiFtAjEAHCeIK3pedSk4LRBz HRCsdIF6Vif0uRf1Oyo4GANHGlrKDknOgD5xctbM+eW0XFQyQGj8c58GkpyOP881qNVU 7+CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KuWfVJmwiYFrjBYD5I8hPFxxzsgnJfeoN2PJ/5VwVFo=; b=GuTacE7Fq3dHyQ6ZBcGjfnfYbGnkJrrOoexCTgisLD4H9WMxEQp4wZ4qu/RSKalj7w CbuAeBRCbmVRdMjkjbIEAMWQ54H5iZAaJT4OMwxw1OE7DrzsID+wfa419olFuwRyGxKu E7U6C/3d1ESf6z3FXzV5sXC/PlOAxnGoi598LQkHVsC3PZZ98tldXjoRUsDmx/KX7nEy meDBontJqI3K333uHoh2N6k8wtPY9bstGL3qaUaJOrrcTsfZL0gcf8+vSEM7mW1Vp39Q 6BR69CcfgNlNyaXLcyCSrLrr0j6wegjC1WZFlL64V4PwyDrTed/buPeR5/7Tsahb47nD w/jg== X-Gm-Message-State: AOAM5313tcC20LXLhfUB3//JXGacPkQhjoZUQoB8lHlMlTSMXRBr0y87 GAAQlJt6iMFhKoR2p3ofwRA= X-Google-Smtp-Source: ABdhPJywrkYKDO2m53ZlDClFzmqKQW/4vr28mkI+ML3NJZ3QDwXCAqQ2Z9CEZuZSTgVzihSr7GrzyQ== X-Received: by 2002:ac2:561c:: with SMTP id v28mr2325912lfd.604.1635103794358; Sun, 24 Oct 2021 12:29:54 -0700 (PDT) Received: from localhost.localdomain (46-138-50-159.dynamic.spd-mgts.ru. [46.138.50.159]) by smtp.gmail.com with ESMTPSA id t20sm1616902lft.240.2021.10.24.12.29.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Oct 2021 12:29:53 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , Mark Brown , Takashi Iwai , Jaroslav Kysela , Liam Girdwood Subject: [PATCH v1 1/2] ASoC: tegra: Restore AC97 support Date: Sun, 24 Oct 2021 22:28:52 +0300 Message-Id: <20211024192853.21957-1-digetx@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 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" The device-tree of AC97 codecs need to be parsed differently from I2S codecs, plus codec device may need to be created. This was missed by the patch that unified machine drivers into a single driver, fix it. It should restore audio on Toradex Colibri board. Cc: Fixes: cc8f70f56039 ("ASoC: tegra: Unify ASoC machine drivers") Signed-off-by: Dmitry Osipenko --- sound/soc/tegra/tegra_asoc_machine.c | 59 +++++++++++++++++++++++----- sound/soc/tegra/tegra_asoc_machine.h | 1 + 2 files changed, 50 insertions(+), 10 deletions(-) diff --git a/sound/soc/tegra/tegra_asoc_machine.c b/sound/soc/tegra/tegra_asoc_machine.c index 3cbe6ef1cf9f..d92fabff08bc 100644 --- a/sound/soc/tegra/tegra_asoc_machine.c +++ b/sound/soc/tegra/tegra_asoc_machine.c @@ -341,9 +341,34 @@ tegra_machine_parse_phandle(struct device *dev, const char *name) return np; } +static void tegra_machine_unregister_codec(void *pdev) +{ + platform_device_unregister(pdev); +} + +static int tegra_machine_register_codec(struct device *dev, const char *name) +{ + struct platform_device *pdev; + int err; + + if (!name) + return 0; + + pdev = platform_device_register_simple(name, -1, NULL, 0); + if (IS_ERR(pdev)) + return PTR_ERR(pdev); + + err = devm_add_action_or_reset(dev, tegra_machine_unregister_codec, + pdev); + if (err) + return err; + + return 0; +} + int tegra_asoc_machine_probe(struct platform_device *pdev) { - struct device_node *np_codec, *np_i2s; + struct device_node *np_codec, *np_i2s, *np_ac97; const struct tegra_asoc_data *asoc; struct device *dev = &pdev->dev; struct tegra_machine *machine; @@ -404,17 +429,30 @@ int tegra_asoc_machine_probe(struct platform_device *pdev) return err; } - np_codec = tegra_machine_parse_phandle(dev, "nvidia,audio-codec"); - if (IS_ERR(np_codec)) - return PTR_ERR(np_codec); + if (asoc->set_ac97) { + err = tegra_machine_register_codec(dev, asoc->codec_dev_name); + if (err) + return err; + + np_ac97 = tegra_machine_parse_phandle(dev, "nvidia,ac97-controller"); + if (IS_ERR(np_ac97)) + return PTR_ERR(np_ac97); - np_i2s = tegra_machine_parse_phandle(dev, "nvidia,i2s-controller"); - if (IS_ERR(np_i2s)) - return PTR_ERR(np_i2s); + card->dai_link->cpus->of_node = np_ac97; + card->dai_link->platforms->of_node = np_ac97; + } else { + np_codec = tegra_machine_parse_phandle(dev, "nvidia,audio-codec"); + if (IS_ERR(np_codec)) + return PTR_ERR(np_codec); - card->dai_link->cpus->of_node = np_i2s; - card->dai_link->codecs->of_node = np_codec; - card->dai_link->platforms->of_node = np_i2s; + np_i2s = tegra_machine_parse_phandle(dev, "nvidia,i2s-controller"); + if (IS_ERR(np_i2s)) + return PTR_ERR(np_i2s); + + card->dai_link->cpus->of_node = np_i2s; + card->dai_link->codecs->of_node = np_codec; + card->dai_link->platforms->of_node = np_i2s; + } if (asoc->add_common_controls) { card->controls = tegra_machine_controls; @@ -589,6 +627,7 @@ static struct snd_soc_card snd_soc_tegra_wm9712 = { static const struct tegra_asoc_data tegra_wm9712_data = { .card = &snd_soc_tegra_wm9712, .add_common_dapm_widgets = true, + .codec_dev_name = "wm9712-codec", .set_ac97 = true, }; diff --git a/sound/soc/tegra/tegra_asoc_machine.h b/sound/soc/tegra/tegra_asoc_machine.h index 8ee0ec814f67..d6a8d1320551 100644 --- a/sound/soc/tegra/tegra_asoc_machine.h +++ b/sound/soc/tegra/tegra_asoc_machine.h @@ -13,6 +13,7 @@ struct snd_soc_pcm_runtime; struct tegra_asoc_data { unsigned int (*mclk_rate)(unsigned int srate); + const char *codec_dev_name; struct snd_soc_card *card; unsigned int mclk_id; bool hp_jack_gpio_active_low; From patchwork Sun Oct 24 19:28:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 12580415 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF540C433EF for ; Sun, 24 Oct 2021 19:31:46 +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 752346101D for ; Sun, 24 Oct 2021 19:31:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 752346101D 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-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 D6CD7166F; Sun, 24 Oct 2021 21:30:53 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D6CD7166F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1635103903; bh=UwS5inRIoY5tmGjIcUIfra5d2Km6gX7ZMf/0Pg3WWcM=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=WDRb9JMj9J6bK1kqRCghLnZVfr2IfW8nAguIfJrAZX2Xbyde7GxAZuCa2LJlN7VQV zsz9YrkdWuhtOa1A0oGTnAxQupbx6KDxKI7DHLuvUV+42RXl4qVwwQsTfab5s5h58U hDr4xV8spyRfTWT49jM50EfW5h2e8cCT70noD4t4= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 24820F8049C; Sun, 24 Oct 2021 21:30:11 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3969EF8013D; Sun, 24 Oct 2021 21:30:06 +0200 (CEST) Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) (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 4802BF8013D for ; Sun, 24 Oct 2021 21:29:58 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 4802BF8013D Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JkkG3uRp" Received: by mail-lf1-x136.google.com with SMTP id bq11so4937011lfb.10 for ; Sun, 24 Oct 2021 12:29:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fssUPo649zl7hYXCezg8n0RZeu85Xq1Alf+1ngKVAWs=; b=JkkG3uRp6UIRQc8S3URH/qL5Y36IGMonoPcLuVzDUz5yFLlplSZr6YivUkaXR8eg1m Y6zMydyKTnWaGc1yz25mGzthi2KJ8K+KSsLomf22u1bYyRL3lELbk4/h9/ARaPJROpL6 fzmHp65yEc6iexeIFLQk3HW82i/GZ91Gjg6YIU/9ZHuWTnp/AacuklVfVeJbppQE3rd3 MbpYtzMW6PlkMma9FY+ZgrAMj6bInidDUMKizhXfyYXW/MQb8CnoF2Ru0nJMA7tD5EYN OfMSIQhFZeab9HzwwbyORdboAWnIUC3FwpNqkFEh8yK0wqdP4dR1ekdyGOm5ppE4CJXO iZ9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fssUPo649zl7hYXCezg8n0RZeu85Xq1Alf+1ngKVAWs=; b=pB4YbErMlp7UWed7l8Lh4u7Je/nTzTSzRRcnHjhoSjdWjFSSnugXDo/HyosX7uFNWM G2Gr7aIUv1uZt8+/6K1KKV2jMXi+AyGYFv+EehJRUnL0dWUuDZVBGmmsSs+2kf9kNwog kByhlc+q9WzVgLFrSQCXp10rvj0M+F+qUadtc8ZBxzyogPQ5fWlJJfCqt+gUoZrI4BRf N168+PslHeeMZFnJ4O6HYysEdUACwSyWU2TLdOeEk9jlATx1BicuWehF6GX9r6XYA6Ev zdOV7weKAVbTKQRaJzq1wCs96+/fvUoafz/Xf3xd+SirvQQwK5ZnK+XWibgGphDzNxub sLaQ== X-Gm-Message-State: AOAM530O0xItrqQdQ7UNxISx+9JFpCyUwAWvDjZpeLR0nmDTnmM87hSM E+3MB4eZbG0t31FC475GyTE= X-Google-Smtp-Source: ABdhPJzZw1oH1wNEEPnqrJKVnnGPyxkUNeSSGCfgs8uqukJkiYf3SfVa5/DG7hsouGPhzLpngVGoqQ== X-Received: by 2002:ac2:5328:: with SMTP id f8mr3258220lfh.233.1635103795071; Sun, 24 Oct 2021 12:29:55 -0700 (PDT) Received: from localhost.localdomain (46-138-50-159.dynamic.spd-mgts.ru. [46.138.50.159]) by smtp.gmail.com with ESMTPSA id t20sm1616902lft.240.2021.10.24.12.29.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Oct 2021 12:29:54 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , Mark Brown , Takashi Iwai , Jaroslav Kysela , Liam Girdwood Subject: [PATCH v1 2/2] ASoC: tegra: Set default card name for Trimslice Date: Sun, 24 Oct 2021 22:28:53 +0300 Message-Id: <20211024192853.21957-2-digetx@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211024192853.21957-1-digetx@gmail.com> References: <20211024192853.21957-1-digetx@gmail.com> MIME-Version: 1.0 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" The default card name for Trimslice device should be "tegra-trimslice". It got lost by accident during unification of machine sound drivers, fix it. Cc: Fixes: cc8f70f56039 ("ASoC: tegra: Unify ASoC machine drivers") Signed-off-by: Dmitry Osipenko --- sound/soc/tegra/tegra_asoc_machine.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/tegra/tegra_asoc_machine.c b/sound/soc/tegra/tegra_asoc_machine.c index d92fabff08bc..b95438c3dbf7 100644 --- a/sound/soc/tegra/tegra_asoc_machine.c +++ b/sound/soc/tegra/tegra_asoc_machine.c @@ -725,6 +725,7 @@ static struct snd_soc_dai_link tegra_tlv320aic23_dai = { }; static struct snd_soc_card snd_soc_tegra_trimslice = { + .name = "tegra-trimslice", .components = "codec:tlv320aic23", .dai_link = &tegra_tlv320aic23_dai, .num_links = 1,