From 64f98049f2a10122a19aa8eb1f1364bad7919ebf Mon Sep 17 00:00:00 2001 From: sheetal Date: Wed, 7 Feb 2024 17:35:18 +0530 Subject: [PATCH] [UPSTREAM] arm64: tegra: Remove Jetson Orin NX and Jetson Orin Nano DTSI Jetson Orin NX and Jetson Orin Nano DTSI files just define the HDA label and it is already added as part of base DTS files. Hence, removing these files. Upstream commit ID: cc36acb8a67ddfe4bc7bc722748f6c1b72eed5ed Bug 4429992 TAS-2240 Change-Id: I07450f4165905393728224d412462a2835e30abc Signed-off-by: sheetal Signed-off-by: Thierry Reding Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/3086461 Reviewed-by: Sameer Pujar Reviewed-by: Mohan kumar Reviewed-by: Laxman Dewangan (cherry picked from commit 11c5935bc2733d47d9d0e7a7803eaf9a16468580) Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/3151096 Tested-by: Brad Griffis Reviewed-by: Brad Griffis GVS: buildbot_gerritrpt --- tegra234-p3767-0000.dtsi | 14 -------------- tegra234-p3767-0005.dtsi | 14 -------------- tegra234-p3768-0000+p3767-0000.dts | 2 +- tegra234-p3768-0000+p3767-0005.dts | 2 +- 4 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 tegra234-p3767-0000.dtsi delete mode 100644 tegra234-p3767-0005.dtsi diff --git a/tegra234-p3767-0000.dtsi b/tegra234-p3767-0000.dtsi deleted file mode 100644 index baf4f69..0000000 --- a/tegra234-p3767-0000.dtsi +++ /dev/null @@ -1,14 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 - -#include "tegra234-p3767.dtsi" - -/ { - compatible = "nvidia,p3767-0000", "nvidia,tegra234"; - model = "NVIDIA Jetson Orin NX"; - - bus@0 { - hda@3510000 { - nvidia,model = "NVIDIA Jetson Orin NX HDA"; - }; - }; -}; diff --git a/tegra234-p3767-0005.dtsi b/tegra234-p3767-0005.dtsi deleted file mode 100644 index 232fa95..0000000 --- a/tegra234-p3767-0005.dtsi +++ /dev/null @@ -1,14 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 - -#include "tegra234-p3767.dtsi" - -/ { - compatible = "nvidia,p3767-0005", "nvidia,tegra234"; - model = "NVIDIA Jetson Orin Nano"; - - bus@0 { - hda@3510000 { - nvidia,model = "NVIDIA Jetson Orin Nano HDA"; - }; - }; -}; diff --git a/tegra234-p3768-0000+p3767-0000.dts b/tegra234-p3768-0000+p3767-0000.dts index 4c75dc9..1607ee1 100644 --- a/tegra234-p3768-0000+p3767-0000.dts +++ b/tegra234-p3768-0000+p3767-0000.dts @@ -4,7 +4,7 @@ #include #include -#include "tegra234-p3767-0000.dtsi" +#include "tegra234-p3767.dtsi" #include "tegra234-p3768-0000.dtsi" / { diff --git a/tegra234-p3768-0000+p3767-0005.dts b/tegra234-p3768-0000+p3767-0005.dts index ba94920..dc2d4be 100644 --- a/tegra234-p3768-0000+p3767-0005.dts +++ b/tegra234-p3768-0000+p3767-0005.dts @@ -4,7 +4,7 @@ #include #include -#include "tegra234-p3767-0005.dtsi" +#include "tegra234-p3767.dtsi" #include "tegra234-p3768-0000.dtsi" / {