From c7747eb4586f52eba3ab6b3150bb1db4b77aaed7 Mon Sep 17 00:00:00 2001 From: Ritu Chaudhary Date: Fri, 6 Dec 2024 09:30:59 +0000 Subject: [PATCH] t23x: nv-public: Remove redundant nodes in DT - Upstream DT only enables the IO ports which are exposed out of CVB. - Remove unnecessary IO nodes from downstream DT. - Removed nodes are : agx/concord(p3737) : I2S3, I2S5, DMIC1, DMIC2, DMIC4, DSPK1, DSPK2 igx(p3740) : I2S3, I2S5, DMIC1, DMIC2, DMIC4, DSPK1, DSPK2 nano/nx (p3768) : I2S1, I2S3, I2S5, DMIC1, DMIC2, DMIC3, DMIC4, DSPK1, DSPK2 Bug 4961348 Change-Id: Id493ae743446d888fe322dd3887729376555541f Signed-off-by: Ritu Chaudhary Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/3263289 Reviewed-by: Mohan kumar GVS: buildbot_gerritrpt Reviewed-by: Sheetal . Reviewed-by: svcacv --- ...ra234-p3737-0000+p3701-xxxx-nv-common.dtsi | 58 --------------- ...ra234-p3740-0002+p3701-0008-nv-common.dtsi | 59 ---------------- ...ra234-p3768-0000+p3767-xxxx-nv-common.dtsi | 70 ------------------- nv-soc/tegra234-soc-audio-dai-links.dtsi | 57 --------------- 4 files changed, 244 deletions(-) diff --git a/nv-platform/tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi b/nv-platform/tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi index 2ff4a9d..6e0be1e 100644 --- a/nv-platform/tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi +++ b/nv-platform/tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi @@ -45,64 +45,6 @@ }; aconnect@2900000 { - ahub@2900800 { - i2s@2901200 { - status = "okay"; - }; - - i2s@2901400 { - status = "okay"; - }; - - dmic@2904000 { - status = "okay"; - }; - - dmic@2904100 { - status = "okay"; - }; - - dmic@2904300 { - status = "okay"; - }; - - dspk@2905000 { - status = "okay"; - }; - - dspk@2905100 { - status = "okay"; - }; - - afc@2907000 { - status = "okay"; - }; - - afc@2907100 { - status = "okay"; - }; - - afc@2907200 { - status = "okay"; - }; - - afc@2907300 { - status = "okay"; - }; - - afc@2907400 { - status = "okay"; - }; - - afc@2907500 { - status = "okay"; - }; - - arad@290e400 { - status = "okay"; - }; - }; - adsp@2993000 { status = "okay"; }; diff --git a/nv-platform/tegra234-p3740-0002+p3701-0008-nv-common.dtsi b/nv-platform/tegra234-p3740-0002+p3701-0008-nv-common.dtsi index d3bb07b..f9273cf 100644 --- a/nv-platform/tegra234-p3740-0002+p3701-0008-nv-common.dtsi +++ b/nv-platform/tegra234-p3740-0002+p3701-0008-nv-common.dtsi @@ -154,65 +154,6 @@ }; aconnect@2900000 { - ahub@2900800 { - i2s@2901200 { - status = "okay"; - }; - - i2s@2901400 { - status = "okay"; - }; - - dmic@2904000 { - status = "okay"; - }; - - dmic@2904100 { - status = "okay"; - }; - - - dmic@2904300 { - status = "okay"; - }; - - dspk@2905000 { - status = "okay"; - }; - - dspk@2905100 { - status = "okay"; - }; - - arad@290e400 { - status = "okay"; - }; - - afc@2907000 { - status = "okay"; - }; - - afc@2907100 { - status = "okay"; - }; - - afc@2907200 { - status = "okay"; - }; - - afc@2907300 { - status = "okay"; - }; - - afc@2907400 { - status = "okay"; - }; - - afc@2907500 { - status = "okay"; - }; - }; - adsp@2993000 { status = "okay"; }; diff --git a/nv-platform/tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi b/nv-platform/tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi index 9ddab33..bc31ba1 100644 --- a/nv-platform/tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi +++ b/nv-platform/tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi @@ -42,76 +42,6 @@ }; aconnect@2900000 { - ahub@2900800 { - i2s@2901000 { - status = "okay"; - }; - - i2s@2901200 { - status = "okay"; - }; - - i2s@2901400 { - status = "okay"; - }; - - i2s@2901500 { - status = "okay"; - }; - - dmic@2904000 { - status = "okay"; - }; - - dmic@2904100 { - status = "okay"; - }; - - dmic@2904200 { - status = "okay"; - }; - - dmic@2904300 { - status = "okay"; - }; - - dspk@2905000 { - status = "okay"; - }; - - dspk@2905100 { - status = "okay"; - }; - - afc@2907000 { - status = "okay"; - }; - - afc@2907100 { - status = "okay"; - }; - - afc@2907200 { - status = "okay"; - }; - - afc@2907300 { - status = "okay"; - }; - - afc@2907400 { - status = "okay"; - }; - - afc@2907500 { - status = "okay"; - }; - - arad@290e400 { - status = "okay"; - }; - }; - adsp@2993000 { status = "okay"; }; diff --git a/nv-soc/tegra234-soc-audio-dai-links.dtsi b/nv-soc/tegra234-soc-audio-dai-links.dtsi index e2112cb..ba89b38 100644 --- a/nv-soc/tegra234-soc-audio-dai-links.dtsi +++ b/nv-soc/tegra234-soc-audio-dai-links.dtsi @@ -4,63 +4,6 @@ / { tegra_sound: sound { nvidia,ahub-c2c-links; - dais = /* ADMAIF (FE) Ports */ - <&admaif0_port>, <&admaif1_port>, <&admaif2_port>, <&admaif3_port>, - <&admaif4_port>, <&admaif5_port>, <&admaif6_port>, <&admaif7_port>, - <&admaif8_port>, <&admaif9_port>, <&admaif10_port>, <&admaif11_port>, - <&admaif12_port>, <&admaif13_port>, <&admaif14_port>, <&admaif15_port>, - <&admaif16_port>, <&admaif17_port>, <&admaif18_port>, <&admaif19_port>, - /* XBAR Ports */ - <&xbar_i2s1_port>, <&xbar_i2s2_port>, <&xbar_i2s3_port>, - <&xbar_i2s4_port>, <&xbar_i2s5_port>, <&xbar_i2s6_port>, - <&xbar_dmic1_port>, <&xbar_dmic2_port>, <&xbar_dmic3_port>, <&xbar_dmic4_port>, - <&xbar_dspk1_port>, <&xbar_dspk2_port>, - <&xbar_sfc1_in_port>, <&xbar_sfc2_in_port>, - <&xbar_sfc3_in_port>, <&xbar_sfc4_in_port>, - <&xbar_mvc1_in_port>, <&xbar_mvc2_in_port>, - <&xbar_amx1_in1_port>, <&xbar_amx1_in2_port>, - <&xbar_amx1_in3_port>, <&xbar_amx1_in4_port>, - <&xbar_amx2_in1_port>, <&xbar_amx2_in2_port>, - <&xbar_amx2_in3_port>, <&xbar_amx2_in4_port>, - <&xbar_amx3_in1_port>, <&xbar_amx3_in2_port>, - <&xbar_amx3_in3_port>, <&xbar_amx3_in4_port>, - <&xbar_amx4_in1_port>, <&xbar_amx4_in2_port>, - <&xbar_amx4_in3_port>, <&xbar_amx4_in4_port>, - <&xbar_adx1_in_port>, <&xbar_adx2_in_port>, - <&xbar_adx3_in_port>, <&xbar_adx4_in_port>, - <&xbar_mix_in1_port>, <&xbar_mix_in2_port>, - <&xbar_mix_in3_port>, <&xbar_mix_in4_port>, - <&xbar_mix_in5_port>, <&xbar_mix_in6_port>, - <&xbar_mix_in7_port>, <&xbar_mix_in8_port>, - <&xbar_mix_in9_port>, <&xbar_mix_in10_port>, - <&xbar_asrc_in1_port>, <&xbar_asrc_in2_port>, - <&xbar_asrc_in3_port>, <&xbar_asrc_in4_port>, - <&xbar_asrc_in5_port>, <&xbar_asrc_in6_port>, - <&xbar_asrc_in7_port>, - <&xbar_ope1_in_port>, - /* HW accelerators */ - <&sfc1_out_port>, <&sfc2_out_port>, - <&sfc3_out_port>, <&sfc4_out_port>, - <&mvc1_out_port>, <&mvc2_out_port>, - <&amx1_out_port>, <&amx2_out_port>, - <&amx3_out_port>, <&amx4_out_port>, - <&adx1_out1_port>, <&adx1_out2_port>, - <&adx1_out3_port>, <&adx1_out4_port>, - <&adx2_out1_port>, <&adx2_out2_port>, - <&adx2_out3_port>, <&adx2_out4_port>, - <&adx3_out1_port>, <&adx3_out2_port>, - <&adx3_out3_port>, <&adx3_out4_port>, - <&adx4_out1_port>, <&adx4_out2_port>, - <&adx4_out3_port>, <&adx4_out4_port>, - <&mix_out1_port>, <&mix_out2_port>, <&mix_out3_port>, - <&mix_out4_port>, <&mix_out5_port>, - <&asrc_out1_port>, <&asrc_out2_port>, <&asrc_out3_port>, - <&asrc_out4_port>, <&asrc_out5_port>, <&asrc_out6_port>, - <&ope1_out_port>, - /* BE I/O Ports */ - <&i2s1_port>, <&i2s2_port>, <&i2s3_port>, <&i2s4_port>, <&i2s5_port>, <&i2s6_port>, - <&dmic1_port>, <&dmic2_port>, <&dmic3_port>, <&dmic4_port>, - <&dspk1_port>, <&dspk2_port>; /* mixer-controls node provide controls to override PCM params */ mixer-controls {