From: Sameer Pujar <spujar@nvidia.com>
To: <broonie@kernel.org>, <lgirdwood@gmail.com>, <robh+dt@kernel.org>,
<kuninori.morimoto.gx@renesas.com>,
<pierre-louis.bossart@linux.intel.com>, <perex@perex.cz>,
<tiwai@suse.com>, <thierry.reding@gmail.com>,
<jonathanh@nvidia.com>
Cc: <alsa-devel@alsa-project.org>, <devicetree@vger.kernel.org>,
<linux-tegra@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<sharadg@nvidia.com>, <mkumard@nvidia.com>,
<viswanathl@nvidia.com>, <rlokhande@nvidia.com>,
<dramesh@nvidia.com>, <atalambedu@nvidia.com>,
<nwartikar@nvidia.com>, <swarren@nvidia.com>,
<nicoleotsuka@gmail.com>, Sameer Pujar <spujar@nvidia.com>
Subject: [PATCH v3 13/13] arm64: tegra: Audio graph sound card for Jetson Nano and TX1
Date: Thu, 1 Oct 2020 23:03:07 +0530 [thread overview]
Message-ID: <1601573587-15288-14-git-send-email-spujar@nvidia.com> (raw)
In-Reply-To: <1601573587-15288-1-git-send-email-spujar@nvidia.com>
Enable support for audio-graph based sound card on Jetson-Nano and
Jetson-TX1. Depending on the platform, required I/O interfaces are
enabled.
* Jetson-Nano: Enable I2S3, I2S4, DMIC1 and DMIC2.
* Jetson-TX1: Enable all I2S and DMIC interfaces.
Signed-off-by: Sameer Pujar <spujar@nvidia.com>
---
arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 219 +++++++++++++++++++++
arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 124 ++++++++++++
2 files changed, 343 insertions(+)
diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts b/arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts
index 4c9c2a0..1233d67 100644
--- a/arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts
@@ -3,6 +3,7 @@
#include "tegra210-p2180.dtsi"
#include "tegra210-p2597.dtsi"
+#include "tegra210-audio-graph.dtsi"
/ {
model = "NVIDIA Jetson TX1 Developer Kit";
@@ -127,4 +128,222 @@
status = "okay";
};
};
+
+ tegra_sound {
+ status = "okay";
+
+ compatible = "nvidia,tegra210-audio-graph-card";
+
+ dais = /* FE */
+ <&admaif1_port>, <&admaif2_port>, <&admaif3_port>,
+ <&admaif4_port>, <&admaif5_port>, <&admaif6_port>,
+ <&admaif7_port>, <&admaif8_port>, <&admaif9_port>,
+ <&admaif10_port>,
+ /* Router */
+ <&xbar_i2s1_port>, <&xbar_i2s2_port>, <&xbar_i2s3_port>,
+ <&xbar_i2s4_port>, <&xbar_i2s5_port>, <&xbar_dmic1_port>,
+ <&xbar_dmic2_port>, <&xbar_dmic3_port>,
+ /* I/O DAP Ports */
+ <&i2s1_port>, <&i2s2_port>, <&i2s3_port>, <&i2s4_port>,
+ <&i2s5_port>, <&dmic1_port>, <&dmic2_port>, <&dmic3_port>;
+
+ label = "jetson-tx1-ape";
+ };
+};
+
+&tegra_admaif {
+ status = "okay";
+};
+
+&tegra_ahub {
+ status = "okay";
+
+ ports {
+ xbar_i2s1_port: port@a {
+ reg = <0xa>;
+ xbar_i2s1_ep: endpoint {
+ remote-endpoint = <&i2s1_cif_ep>;
+ };
+ };
+ xbar_i2s2_port: port@b {
+ reg = <0xb>;
+ xbar_i2s2_ep: endpoint {
+ remote-endpoint = <&i2s2_cif_ep>;
+ };
+ };
+ xbar_i2s3_port: port@c {
+ reg = <0xc>;
+ xbar_i2s3_ep: endpoint {
+ remote-endpoint = <&i2s3_cif_ep>;
+ };
+ };
+ xbar_i2s4_port: port@d {
+ reg = <0xd>;
+ xbar_i2s4_ep: endpoint {
+ remote-endpoint = <&i2s4_cif_ep>;
+ };
+ };
+ xbar_i2s5_port: port@e {
+ reg = <0xe>;
+ xbar_i2s5_ep: endpoint {
+ remote-endpoint = <&i2s5_cif_ep>;
+ };
+ };
+ xbar_dmic1_port: port@f {
+ reg = <0xf>;
+ xbar_dmic1_ep: endpoint {
+ remote-endpoint = <&dmic1_cif_ep>;
+ };
+ };
+ xbar_dmic2_port: port@10 {
+ reg = <0x10>;
+ xbar_dmic2_ep: endpoint {
+ remote-endpoint = <&dmic2_cif_ep>;
+ };
+ };
+ xbar_dmic3_port: port@11 {
+ reg = <0x11>;
+ xbar_dmic3_ep: endpoint {
+ remote-endpoint = <&dmic3_cif_ep>;
+ };
+ };
+ };
+};
+
+&tegra_i2s1 {
+ status = "okay";
+
+ port@0 {
+ i2s1_cif_ep: endpoint {
+ remote-endpoint = <&xbar_i2s1_ep>;
+ };
+ };
+
+ i2s1_port: port@1 {
+ i2s1_dap: endpoint {
+ dai-format = "i2s";
+
+ /* Placeholder for external Codec */
+ };
+ };
+};
+
+&tegra_i2s2 {
+ status = "okay";
+
+ port@0 {
+ i2s2_cif_ep: endpoint {
+ remote-endpoint = <&xbar_i2s2_ep>;
+ };
+ };
+
+ i2s2_port: port@1 {
+ i2s2_dap: endpoint {
+ dai-format = "i2s";
+
+ /* Placeholder for external Codec */
+ };
+ };
+};
+
+&tegra_i2s3 {
+ status = "okay";
+
+ port@0 {
+ i2s3_cif_ep: endpoint {
+ remote-endpoint = <&xbar_i2s3_ep>;
+ };
+ };
+
+ i2s3_port: port@1 {
+ i2s3_dap_ep: endpoint {
+ dai-format = "i2s";
+
+ /* Placeholder for external Codec */
+ };
+ };
+};
+
+&tegra_i2s4 {
+ status = "okay";
+
+ port@0 {
+ i2s4_cif_ep: endpoint {
+ remote-endpoint = <&xbar_i2s4_ep>;
+ };
+ };
+
+ i2s4_port: port@1 {
+ i2s4_dap: endpoint {
+ dai-format = "i2s";
+
+ /* Placeholder for external Codec */
+ };
+ };
+};
+
+&tegra_i2s5 {
+ status = "okay";
+
+ port@0 {
+ i2s5_cif_ep: endpoint {
+ remote-endpoint = <&xbar_i2s5_ep>;
+ };
+ };
+
+ i2s5_port: port@1 {
+ i2s5_dap: endpoint {
+ dai-format = "i2s";
+
+ /* Placeholder for external Codec */
+ };
+ };
+};
+
+&tegra_dmic1 {
+ status = "okay";
+
+ port@0 {
+ dmic1_cif_ep: endpoint {
+ remote-endpoint = <&xbar_dmic1_ep>;
+ };
+ };
+
+ dmic1_port: port@1 {
+ dmic1_dap: endpoint {
+ /* Placeholder for external Codec */
+ };
+ };
+};
+
+&tegra_dmic2 {
+ status = "okay";
+
+ port@0 {
+ dmic2_cif_ep: endpoint {
+ remote-endpoint = <&xbar_dmic2_ep>;
+ };
+ };
+
+ dmic2_port: port@1 {
+ dmic2_dap: endpoint {
+ /* Placeholder for external Codec */
+ };
+ };
+};
+
+&tegra_dmic3 {
+ status = "okay";
+
+ port@0 {
+ dmic3_cif_ep: endpoint {
+ remote-endpoint = <&xbar_dmic3_ep>;
+ };
+ };
+
+ dmic3_port: port@1 {
+ dmic3_dap: endpoint {
+ /* Placeholder for external Codec */
+ };
+ };
};
diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts b/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts
index 859241d..fcce8eed 100644
--- a/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts
@@ -6,6 +6,7 @@
#include <dt-bindings/mfd/max77620.h>
#include "tegra210.dtsi"
+#include "tegra210-audio-graph.dtsi"
/ {
model = "NVIDIA Jetson Nano Developer Kit";
@@ -870,4 +871,127 @@
vin-supply = <&vdd_5v0_sys>;
};
+
+ tegra_sound {
+ status = "okay";
+
+ compatible = "nvidia,tegra210-audio-graph-card";
+
+ dais = /* FE */
+ <&admaif1_port>, <&admaif2_port>, <&admaif3_port>,
+ <&admaif4_port>, <&admaif5_port>, <&admaif6_port>,
+ <&admaif7_port>, <&admaif8_port>, <&admaif9_port>,
+ <&admaif10_port>,
+ /* Router */
+ <&xbar_i2s3_port>, <&xbar_i2s4_port>,
+ <&xbar_dmic1_port>, <&xbar_dmic2_port>,
+ /* I/O DAP Ports */
+ <&i2s3_port>, <&i2s4_port>,
+ <&dmic1_port>, <&dmic2_port>;
+
+ label = "jetson-nano-ape";
+ };
+};
+
+&tegra_admaif {
+ status = "okay";
+};
+
+&tegra_ahub {
+ status = "okay";
+
+ ports {
+ xbar_i2s3_port: port@c {
+ reg = <0xc>;
+ xbar_i2s3_ep: endpoint {
+ remote-endpoint = <&i2s3_cif_ep>;
+ };
+ };
+ xbar_i2s4_port: port@d {
+ reg = <0xd>;
+ xbar_i2s4_ep: endpoint {
+ remote-endpoint = <&i2s4_cif_ep>;
+ };
+ };
+ xbar_dmic1_port: port@f {
+ reg = <0xf>;
+ xbar_dmic1_ep: endpoint {
+ remote-endpoint = <&dmic1_cif_ep>;
+ };
+ };
+ xbar_dmic2_port: port@10 {
+ reg = <0x10>;
+ xbar_dmic2_ep: endpoint {
+ remote-endpoint = <&dmic2_cif_ep>;
+ };
+ };
+ };
+};
+
+&tegra_i2s3 {
+ status = "okay";
+
+ port@0 {
+ i2s3_cif_ep: endpoint {
+ remote-endpoint = <&xbar_i2s3_ep>;
+ };
+ };
+
+ i2s3_port: port@1 {
+ i2s3_dap_ep: endpoint {
+ dai-format = "i2s";
+
+ /* Placeholder for external Codec */
+ };
+ };
+};
+
+&tegra_i2s4 {
+ status = "okay";
+
+ port@0 {
+ i2s4_cif_ep: endpoint {
+ remote-endpoint = <&xbar_i2s4_ep>;
+ };
+ };
+
+ i2s4_port: port@1 {
+ i2s4_dap: endpoint@0 {
+ dai-format = "i2s";
+
+ /* Placeholder for external Codec */
+ };
+ };
+};
+
+&tegra_dmic1 {
+ status = "okay";
+
+ port@0 {
+ dmic1_cif_ep: endpoint@0 {
+ remote-endpoint = <&xbar_dmic1_ep>;
+ };
+ };
+
+ dmic1_port: port@1 {
+ dmic1_dap: endpoint@0 {
+ /* Placeholder for external Codec */
+ };
+ };
+};
+
+&tegra_dmic2 {
+ status = "okay";
+
+ port@0 {
+ dmic2_cif_ep: endpoint@0 {
+ remote-endpoint = <&xbar_dmic2_ep>;
+ };
+ };
+
+ dmic2_port: port@1 {
+ dmic2_dap: endpoint@0 {
+ /* Placeholder for external Codec */
+ };
+ };
};
--
2.7.4
prev parent reply other threads:[~2020-10-01 17:35 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-01 17:32 [PATCH v3 00/13] Audio graph card updates and usage with Tegra210 audio Sameer Pujar
2020-10-01 17:32 ` [PATCH v3 01/13] ASoC: soc-core: Fix component name_prefix parsing Sameer Pujar
2020-10-01 18:53 ` Michał Mirosław
2020-10-02 8:50 ` Sameer Pujar
2020-10-01 17:32 ` [PATCH v3 02/13] ASoC: soc-pcm: Get all BEs along DAPM path Sameer Pujar
2020-10-01 17:32 ` [PATCH v3 03/13] ASoC: audio-graph: Use of_node and DAI for DPCM DAI link names Sameer Pujar
2020-10-01 17:32 ` [PATCH v3 04/13] ASoC: audio-graph: Identify 'no_pcm' DAI links for DPCM Sameer Pujar
2020-10-01 17:32 ` [PATCH v3 05/13] ASoC: audio-graph: Support empty Codec endpoint Sameer Pujar
2020-10-01 17:33 ` [PATCH v3 06/13] ASoC: simple-card-utils: Expose new members for asoc_simple_priv Sameer Pujar
2020-10-02 1:45 ` Kuninori Morimoto
2020-10-02 8:59 ` Sameer Pujar
2020-10-01 17:33 ` [PATCH v3 07/13] ASoC: audio-graph: Update driver as per new exposed members Sameer Pujar
2020-10-02 1:46 ` Kuninori Morimoto
2020-10-02 9:00 ` Sameer Pujar
2020-10-01 17:33 ` [PATCH v3 08/13] ASoC: audio-graph: Expose helpers from audio graph Sameer Pujar
2020-10-01 17:33 ` [PATCH v3 09/13] ASoC: dt-bindings: tegra: Add schema for audio graph card Sameer Pujar
2020-10-06 20:34 ` Rob Herring
2020-10-07 7:13 ` Sameer Pujar
2020-10-16 5:14 ` Sameer Pujar
2020-10-16 16:42 ` Mark Brown
2020-10-01 17:33 ` [PATCH v3 10/13] ASoC: tegra: Add audio graph based card driver Sameer Pujar
2020-10-01 19:07 ` Michał Mirosław
2020-10-01 19:44 ` Jon Hunter
2020-10-01 20:57 ` Dmitry Osipenko
2020-10-01 21:02 ` Dmitry Osipenko
2020-10-02 8:51 ` Sameer Pujar
2020-10-02 5:34 ` Kuninori Morimoto
2020-10-02 9:08 ` Sameer Pujar
2020-10-04 23:20 ` Kuninori Morimoto
2020-10-01 17:33 ` [PATCH v3 11/13] arm64: defconfig: Enable Tegra audio graph " Sameer Pujar
2020-10-01 17:33 ` [PATCH v3 12/13] arm64: tegra: Audio graph header for Tegra210 Sameer Pujar
2020-10-01 17:33 ` Sameer Pujar [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1601573587-15288-14-git-send-email-spujar@nvidia.com \
--to=spujar@nvidia.com \
--cc=alsa-devel@alsa-project.org \
--cc=atalambedu@nvidia.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dramesh@nvidia.com \
--cc=jonathanh@nvidia.com \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=mkumard@nvidia.com \
--cc=nicoleotsuka@gmail.com \
--cc=nwartikar@nvidia.com \
--cc=perex@perex.cz \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=rlokhande@nvidia.com \
--cc=robh+dt@kernel.org \
--cc=sharadg@nvidia.com \
--cc=swarren@nvidia.com \
--cc=thierry.reding@gmail.com \
--cc=tiwai@suse.com \
--cc=viswanathl@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).