nv-tegra-mirror/t23x-public-dts
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/device/hardware/nvidia/t23x-public-dts.git synced 2025-12-22 17:30:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

t23x: nv-public: Remove legacy sound bindings

Browse Source 
Graph sound card driver is enabled by default now and legacy machine
driver is going to be removed. Hence cleanup the legacy bindings and
going forward only maintain the graph sound card bindings. The 'sound'
device for graph card and legacy machine driver were merged earlier,
so we don't require duplicate phandles for the 'sound' node. Hence
remove the 'tegra_sound_graph' phandle.

Bug 4596865

Change-Id: Ie5a0a325a3d8b72d102a789116f7ccafa0bc7726
Signed-off-by: Sameer Pujar <spujar@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/3111444
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Sameer Pujar
2024-04-08 09:57:00 +00:00
committed by mobile promotions
parent 57c3e682de
commit a27a5a2ae2
7 changed files with 2 additions and 2024 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nv-platform/tegra234-p3737-0000.dtsi
View File

@@ -121,7 +121,7 @@
regulator-max-microvolt = <3300000>;
};
tegra_sound_graph: tegra_sound: sound {
tegra_sound: sound {
clocks = <&bpmp TEGRA234_CLK_PLLA>,
<&bpmp TEGRA234_CLK_PLLA_OUT0>,
<&bpmp TEGRA234_CLK_AUD_MCLK>;
@@ -129,14 +129,10 @@
assigned-clocks = <&bpmp TEGRA234_CLK_AUD_MCLK>;
assigned-clock-parents = <&bpmp TEGRA234_CLK_PLLA_OUT0>;
nvidia-audio-card,name = "NVIDIA Jetson AGX Orin APE";
mclk-fs = <256>;
/delete-property/ widgets;
/delete-property/ routing;
hdr40_snd_link_i2s: nvidia-audio-card,dai-link@77 { };
};
eeprom-manager {

17
nv-platform/tegra234-p3740-0002.dtsi
View File

@@ -113,8 +113,6 @@
assigned-clocks = <&bpmp TEGRA234_CLK_AUD_MCLK>;
assigned-clock-parents = <&bpmp TEGRA234_CLK_PLLA_OUT0>;
nvidia-audio-card,name = "NVIDIA Jetson IGX Orin APE";
mclk-fs = <256>;
widgets =
@@ -136,21 +134,6 @@
"CVB-RT Int Spk", "CVB-RT LOUTR",
"CVB-RT DMIC1", "CVB-RT Int Mic",
"CVB-RT DMIC2", "CVB-RT Int Mic";
/* I2S4 dai node */
nvidia-audio-card,dai-link@79 {
link-name = "rt5640-playback";
codec {
sound-dai = <&rt5640 0>;
prefix = "CVB-RT";
};
};
/* I2S6 dai node */
nvidia-audio-card,dai-link@81 {
bitclock-master;
frame-master;
};
};
eeprom-manager {

6
nv-platform/tegra234-p3768-0000.dtsi
View File

@@ -19,16 +19,12 @@
};
tegra_sound_graph: tegra_sound: sound {
tegra_sound: sound {
clocks = <&bpmp TEGRA234_CLK_PLLA>,
<&bpmp TEGRA234_CLK_PLLA_OUT0>,
<&bpmp TEGRA234_CLK_AUD_MCLK>;
clock-names = "pll_a", "plla_out0", "extern1";
assigned-clocks = <&bpmp TEGRA234_CLK_AUD_MCLK>;
assigned-clock-parents = <&bpmp TEGRA234_CLK_PLLA_OUT0>;
nvidia-audio-card,name = "NVIDIA Jetson Orin NX APE";
hdr40_snd_link_i2s: nvidia-audio-card,dai-link@77 { };
};
};

112
nv-soc/tegra234-base-overlay.dtsi
View File

@@ -113,145 +113,34 @@
<49152000>,
<81600000>;
#sound-dai-cells = <1>;
/*
* Below modules are upstreamed and present in v5.15,
* but not yet feature complete. Thus use OOT driver
* versions for now.
*/
i2s@2901000 {
#sound-dai-cells = <1>;
nvidia,ahub-i2s-id = <0>;
};
i2s@2901100 {
#sound-dai-cells = <1>;
nvidia,ahub-i2s-id = <1>;
};
i2s@2901200 {
#sound-dai-cells = <1>;
nvidia,ahub-i2s-id = <2>;
};
i2s@2901300 {
#sound-dai-cells = <1>;
nvidia,ahub-i2s-id = <3>;
};
i2s@2901400 {
#sound-dai-cells = <1>;
nvidia,ahub-i2s-id = <4>;
};
i2s@2901500 {
#sound-dai-cells = <1>;
nvidia,ahub-i2s-id = <5>;
};
dmic@2904000 {
#sound-dai-cells = <1>;
};
dmic@2904100 {
#sound-dai-cells = <1>;
};
dmic@2904200 {
#sound-dai-cells = <1>;
};
dmic@2904300 {
#sound-dai-cells = <1>;
};
dspk@2905000 {
#sound-dai-cells = <1>;
};
dspk@2905100 {
#sound-dai-cells = <1>;
};
admaif@290f000 {
#sound-dai-cells = <1>;
};
/*
* Below modules are upstreamed. DT device nodes
* are backported. But drivers are not in v5.15.
* Thus use existing downstream drivers and add
* '#sound-dai-cells' property needed for downstream
* machine driver.
*/
sfc@2902000 {
#sound-dai-cells = <1>;
};
sfc@2902200 {
#sound-dai-cells = <1>;
};
sfc@2902400 {
#sound-dai-cells = <1>;
};
sfc@2902600 {
#sound-dai-cells = <1>;
};
amx@2903000 {
#sound-dai-cells = <1>;
};
amx@2903100 {
#sound-dai-cells = <1>;
};
amx@2903200 {
#sound-dai-cells = <1>;
};
amx@2903300 {
#sound-dai-cells = <1>;
};
adx@2903800 {
#sound-dai-cells = <1>;
};
adx@2903900 {
#sound-dai-cells = <1>;
};
adx@2903a00 {
#sound-dai-cells = <1>;
};
adx@2903b00 {
#sound-dai-cells = <1>;
};
mvc@290a000 {
#sound-dai-cells = <1>;
};
mvc@290a200 {
#sound-dai-cells = <1>;
};
amixer@290bb00 {
#sound-dai-cells = <1>;
};
processing-engine@2908000 {
#sound-dai-cells = <1>;
};
asrc@2910000 {
#sound-dai-cells = <1>;
};
};
/*
@@ -260,7 +149,6 @@
* enabled as and when needed.
*/
tegra_adsp_audio: adsp_audio {
#sound-dai-cells = <1>;
status = "disabled";
};
};

1869
nv-soc/tegra234-soc-audio-dai-links.dtsi
View File

File diff suppressed because it is too large Load Diff

7
nv-soc/tegra234-soc-overlay.dtsi
View File

@@ -379,7 +379,6 @@
reg = <0x0 0x290e400 0x0 0x400>;
#address-cells = <1>;
#size-cells = <1>;
#sound-dai-cells = <1>;
};
tegra_afc1: afc@2907000 {
@@ -391,7 +390,6 @@
#address-cells = <1>;
#size-cells = <1>;
sound-name-prefix = "AFC1";
#sound-dai-cells = <1>;
};
tegra_afc2: afc@2907100 {
@@ -403,7 +401,6 @@
#address-cells = <1>;
#size-cells = <1>;
sound-name-prefix = "AFC2";
#sound-dai-cells = <1>;
};
tegra_afc3: afc@2907200 {
@@ -415,7 +412,6 @@
#address-cells = <1>;
#size-cells = <1>;
sound-name-prefix = "AFC3";
#sound-dai-cells = <1>;
};
tegra_afc4: afc@2907300 {
@@ -427,7 +423,6 @@
#address-cells = <1>;
#size-cells = <1>;
sound-name-prefix = "AFC4";
#sound-dai-cells = <1>;
};
tegra_afc5: afc@2907400 {
@@ -439,7 +434,6 @@
#address-cells = <1>;
#size-cells = <1>;
sound-name-prefix = "AFC5";
#sound-dai-cells = <1>;
};
tegra_afc6: afc@2907500 {
@@ -451,7 +445,6 @@
#address-cells = <1>;
#size-cells = <1>;
sound-name-prefix = "AFC6";
#sound-dai-cells = <1>;
};
};

9
overlay/tegra234-p3737-0000+p3701-0000-dynamic.dts
View File

@@ -34,7 +34,6 @@
i2c@31e0000 {
rt5640: audio-codec@1c {
#sound-dai-cells = <1>;
status = "okay";
port {
@@ -63,14 +62,6 @@
"CVB-RT Int Spk", "CVB-RT SPORP",
"CVB-RT DMIC1", "CVB-RT Int Mic",
"CVB-RT DMIC2", "CVB-RT Int Mic";
nvidia-audio-card,dai-link@76 {
link-name = "rt5640-playback";
codec {
sound-dai = <&rt5640 0>;
prefix = "CVB-RT";
};
};
};
};
};