overlay: audio: Remove legacy bindings

Graph based sound card is the default now and legacy bindings are
going to be removed. Thus remove legacy bindings.

Bug 4596865

Change-Id: I009fa7825479902ad764bd5c2459f9e41ff124ef
Signed-off-by: Sameer Pujar <spujar@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/tegra-public-dts/+/3111494
Reviewed-by: Dara Ramesh <dramesh@nvidia.com>
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
Reviewed-by: svcacv <svcacv@nvidia.com>
Reviewed-by: Mohan kumar <mkumard@nvidia.com>
This commit is contained in:
Sameer Pujar
2024-04-08 10:20:25 +00:00
committed by mobile promotions
parent 71ae34445f
commit 31b2d3e128
3 changed files with 18 additions and 125 deletions

View File

@@ -1,9 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* // SPDX-FileCopyrightText: Copyright (c) 2019-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
* Copyright (c) 2019-2023, NVIDIA CORPORATION. All rights reserved. //
* // Jetson Device-tree overlay for FE-PI Audio V1 and Z V2.
* Jetson Device-tree overlay for FE-PI Audio V1 and Z V2.
*/
#include <dt-bindings/pinctrl/pinctrl-tegra.h> #include <dt-bindings/pinctrl/pinctrl-tegra.h>
@@ -41,7 +39,6 @@
micbias-voltage-m-volts = <3000>; micbias-voltage-m-volts = <3000>;
VDDA-supply = <&hdr40_vdd_3v3>; VDDA-supply = <&hdr40_vdd_3v3>;
VDDIO-supply = <&hdr40_vdd_3v3>; VDDIO-supply = <&hdr40_vdd_3v3>;
#sound-dai-cells = <0>;
status = "okay"; status = "okay";
sound-name-prefix = "H40-SGTL"; sound-name-prefix = "H40-SGTL";
@@ -57,38 +54,6 @@
}; };
fragment@2 { 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>; target = <&pinmux>;
__overlay__ { __overlay__ {
pinctrl-names = "default"; pinctrl-names = "default";
@@ -130,8 +95,8 @@
}; };
}; };
fragment@5 { fragment@3 {
target = <&tegra_sound_graph>; target = <&tegra_sound>;
__overlay__ { __overlay__ {
widgets = "Headphone", "H40-SGTL Headphone", widgets = "Headphone", "H40-SGTL Headphone",
"Microphone", "H40-SGTL Mic", "Microphone", "H40-SGTL Mic",
@@ -146,7 +111,7 @@
}; };
}; };
fragment@6 { fragment@4 {
target = <&hdr40_snd_i2s_dap_ep>; target = <&hdr40_snd_i2s_dap_ep>;
__overlay__ { __overlay__ {
bitclock-master; bitclock-master;

View File

@@ -1,9 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* // SPDX-FileCopyrightText: Copyright (c) 2020-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
* Copyright (c) 2020-2023, NVIDIA CORPORATION. All rights reserved. //
* //Jetson Device-tree overlay for ReSpeaker 4 Mic Array.
* Jetson Device-tree overlay for ReSpeaker 4 Mic Array.
*/
#include <dt-bindings/pinctrl/pinctrl-tegra.h> #include <dt-bindings/pinctrl/pinctrl-tegra.h>
@@ -20,7 +18,6 @@
ac108_a: ac108@3b{ ac108_a: ac108@3b{
compatible = "x-power,ac108_0"; compatible = "x-power,ac108_0";
reg = <0x3b>; reg = <0x3b>;
#sound-dai-cells = <0>;
data-protocol = <0>; data-protocol = <0>;
status = "okay"; status = "okay";
@@ -37,38 +34,6 @@
}; };
fragment@1 { 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>; target = <&pinmux>;
__overlay__ { __overlay__ {
pinctrl-names = "default"; pinctrl-names = "default";
@@ -103,8 +68,8 @@
}; };
/* Audio graph fragments */ /* Audio graph fragments */
fragment@4 { fragment@2 {
target = <&tegra_sound_graph>; target = <&tegra_sound>;
__overlay__ { __overlay__ {
widgets = "Microphone", "H40-AC Mic"; widgets = "Microphone", "H40-AC Mic";
@@ -120,7 +85,7 @@
}; };
}; };
fragment@5 { fragment@3 {
target = <&hdr40_snd_i2s_dap_ep>; target = <&hdr40_snd_i2s_dap_ep>;
__overlay__ { __overlay__ {
dai-format = "dsp_a"; dai-format = "dsp_a";

View File

@@ -1,10 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* // SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
* Copyright (c) 2021-2023, NVIDIA CORPORATION. All rights reserved. //
* // Jetson Device-tree overlay for ReSpeaker 4 Mic Linear Array.
* Jetson Device-tree overlay for ReSpeaker 4 Mic Linear Array.
*
*/
#include <dt-bindings/pinctrl/pinctrl-tegra.h> #include <dt-bindings/pinctrl/pinctrl-tegra.h>
@@ -21,7 +18,6 @@
ac108_a: ac108@35{ ac108_a: ac108@35{
compatible = "x-power,ac108_0"; compatible = "x-power,ac108_0";
reg = <0x35>; reg = <0x35>;
#sound-dai-cells = <0>;
data-protocol = <0>; data-protocol = <0>;
status = "okay"; status = "okay";
@@ -38,39 +34,6 @@
}; };
fragment@1 { 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>; target = <&pinmux>;
__overlay__ { __overlay__ {
pinctrl-names = "default"; pinctrl-names = "default";
@@ -104,8 +67,8 @@
}; };
}; };
fragment@4 { fragment@2 {
target = <&tegra_sound_graph>; target = <&tegra_sound>;
__overlay__ { __overlay__ {
widgets = "Microphone", "H40-AC Mic"; widgets = "Microphone", "H40-AC Mic";
@@ -121,7 +84,7 @@
}; };
}; };
fragment@5 { fragment@3 {
target = <&hdr40_snd_i2s_dap_ep>; target = <&hdr40_snd_i2s_dap_ep>;
__overlay__ { __overlay__ {
dai-format = "dsp_a"; dai-format = "dsp_a";