diff --git a/overlay/jetson-audio-fe-pi.dtsi b/overlay/jetson-audio-fe-pi.dtsi index ec214da..9296ddb 100644 --- a/overlay/jetson-audio-fe-pi.dtsi +++ b/overlay/jetson-audio-fe-pi.dtsi @@ -1,9 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. All rights reserved. - * - * Jetson Device-tree overlay for FE-PI Audio V1 and Z V2. - */ +// SPDX-FileCopyrightText: Copyright (c) 2019-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// +// Jetson Device-tree overlay for FE-PI Audio V1 and Z V2. #include @@ -41,7 +39,6 @@ micbias-voltage-m-volts = <3000>; VDDA-supply = <&hdr40_vdd_3v3>; VDDIO-supply = <&hdr40_vdd_3v3>; - #sound-dai-cells = <0>; status = "okay"; sound-name-prefix = "H40-SGTL"; @@ -57,38 +54,6 @@ }; fragment@2 { - target = <&tegra_sound>; - __overlay__ { - nvidia-audio-card,widgets = - "Headphone", "H40-SGTL Headphone", - "Microphone", "H40-SGTL Mic", - "Line", "H40-SGTL Line In", - "Line", "H40-SGTL Line Out"; - - nvidia-audio-card,routing = - "H40-SGTL Headphone", "H40-SGTL HP_OUT", - "H40-SGTL MIC_IN", "H40-SGTL Mic", - "H40-SGTL ADC", "H40-SGTL Mic Bias", - "H40-SGTL LINE_IN", "H40-SGTL Line In", - "H40-SGTL Line Out", "H40-SGTL LINE_OUT"; - }; - }; - - fragment@3 { - target = <&hdr40_snd_link_i2s>; - __overlay__ { - link-name = "fe-pi-audio-z-v2"; - bitclock-master; - frame-master; - - codec { - sound-dai = <&sgtl5000>; - prefix = "H40-SGTL"; - }; - }; - }; - - fragment@4 { target = <&pinmux>; __overlay__ { pinctrl-names = "default"; @@ -130,8 +95,8 @@ }; }; - fragment@5 { - target = <&tegra_sound_graph>; + fragment@3 { + target = <&tegra_sound>; __overlay__ { widgets = "Headphone", "H40-SGTL Headphone", "Microphone", "H40-SGTL Mic", @@ -146,7 +111,7 @@ }; }; - fragment@6 { + fragment@4 { target = <&hdr40_snd_i2s_dap_ep>; __overlay__ { bitclock-master; diff --git a/overlay/jetson-audio-respeaker-4-mic-array.dtsi b/overlay/jetson-audio-respeaker-4-mic-array.dtsi index 0702a3a..56a5622 100644 --- a/overlay/jetson-audio-respeaker-4-mic-array.dtsi +++ b/overlay/jetson-audio-respeaker-4-mic-array.dtsi @@ -1,9 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. All rights reserved. - * - * Jetson Device-tree overlay for ReSpeaker 4 Mic Array. - */ +// SPDX-FileCopyrightText: Copyright (c) 2020-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// +//Jetson Device-tree overlay for ReSpeaker 4 Mic Array. #include @@ -20,7 +18,6 @@ ac108_a: ac108@3b{ compatible = "x-power,ac108_0"; reg = <0x3b>; - #sound-dai-cells = <0>; data-protocol = <0>; status = "okay"; @@ -37,38 +34,6 @@ }; fragment@1 { - target = <&tegra_sound>; - __overlay__ { - nvidia-audio-card,widgets = - "Microphone", "H40-AC Mic"; - nvidia-audio-card,routing = - "H40-AC MIC1N", "H40-AC Mic", - "H40-AC MIC1P", "H40-AC Mic", - "H40-AC MIC2N", "H40-AC Mic", - "H40-AC MIC2P", "H40-AC Mic", - "H40-AC MIC3N", "H40-AC Mic", - "H40-AC MIC3P", "H40-AC Mic", - "H40-AC MIC4N", "H40-AC Mic", - "H40-AC MIC4P", "H40-AC Mic", - "H40-AC Capture", "H40-AC Mic"; - }; - }; - - fragment@2 { - target = <&hdr40_snd_link_i2s>; - __overlay__ { - link-name = "respeaker-4-mic-array"; - format = "dsp_a"; - bitclock-master; - frame-master; - codec { - sound-dai = <&ac108_a>; - prefix = "H40-AC"; - }; - }; - }; - - fragment@3 { target = <&pinmux>; __overlay__ { pinctrl-names = "default"; @@ -103,8 +68,8 @@ }; /* Audio graph fragments */ - fragment@4 { - target = <&tegra_sound_graph>; + fragment@2 { + target = <&tegra_sound>; __overlay__ { widgets = "Microphone", "H40-AC Mic"; @@ -120,7 +85,7 @@ }; }; - fragment@5 { + fragment@3 { target = <&hdr40_snd_i2s_dap_ep>; __overlay__ { dai-format = "dsp_a"; diff --git a/overlay/jetson-audio-respeaker-4-mic-lin-array.dtsi b/overlay/jetson-audio-respeaker-4-mic-lin-array.dtsi index 003ec39..5c347f8 100644 --- a/overlay/jetson-audio-respeaker-4-mic-lin-array.dtsi +++ b/overlay/jetson-audio-respeaker-4-mic-lin-array.dtsi @@ -1,10 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. All rights reserved. - * - * Jetson Device-tree overlay for ReSpeaker 4 Mic Linear Array. - * - */ +// SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// +// Jetson Device-tree overlay for ReSpeaker 4 Mic Linear Array. #include @@ -21,7 +18,6 @@ ac108_a: ac108@35{ compatible = "x-power,ac108_0"; reg = <0x35>; - #sound-dai-cells = <0>; data-protocol = <0>; status = "okay"; @@ -38,39 +34,6 @@ }; fragment@1 { - target = <&tegra_sound>; - __overlay__ { - nvidia-audio-card,widgets = - "Microphone", "H40-AC Mic"; - nvidia-audio-card,routing = - "H40-AC MIC1N", "H40-AC Mic", - "H40-AC MIC1P", "H40-AC Mic", - "H40-AC MIC2N", "H40-AC Mic", - "H40-AC MIC2P", "H40-AC Mic", - "H40-AC MIC3N", "H40-AC Mic", - "H40-AC MIC3P", "H40-AC Mic", - "H40-AC MIC4N", "H40-AC Mic", - "H40-AC MIC4P", "H40-AC Mic", - "H40-AC Capture", "H40-AC Mic"; - }; - }; - - fragment@2 { - target = <&hdr40_snd_link_i2s>; - __overlay__ { - link-name = "respeaker-4-mic-array"; - format = "dsp_a"; - fsync-width = <0>; - bitclock-master; - frame-master; - codec { - sound-dai = <&ac108_a>; - prefix = "H40-AC"; - }; - }; - }; - - fragment@3 { target = <&pinmux>; __overlay__ { pinctrl-names = "default"; @@ -104,8 +67,8 @@ }; }; - fragment@4 { - target = <&tegra_sound_graph>; + fragment@2 { + target = <&tegra_sound>; __overlay__ { widgets = "Microphone", "H40-AC Mic"; @@ -121,7 +84,7 @@ }; }; - fragment@5 { + fragment@3 { target = <&hdr40_snd_i2s_dap_ep>; __overlay__ { dai-format = "dsp_a";