diff --git a/nv-platform/tegra234-p3737-0000+p3701-0004-nv.dts b/nv-platform/tegra234-p3737-0000+p3701-0004-nv.dts index c11c8df..ccc7f31 100644 --- a/nv-platform/tegra234-p3737-0000+p3701-0004-nv.dts +++ b/nv-platform/tegra234-p3737-0000+p3701-0004-nv.dts @@ -1,8 +1,12 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. /dts-v1/; -#include "staging/tegra234-p3737-0000+p3701-0004.dts" +#include "tegra234-p3737-0000+p3701-0000.dts" #include "tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi" #include "tegra234-p3701-0000.dtsi" + +/ { + compatible = "nvidia,p3737-0000+p3701-0004", "nvidia,p3701-0004", "nvidia,tegra234"; +}; diff --git a/nv-platform/tegra234-p3737-0000+p3701-0005-nv.dts b/nv-platform/tegra234-p3737-0000+p3701-0005-nv.dts index 4d149fe..eb5d6d1 100644 --- a/nv-platform/tegra234-p3737-0000+p3701-0005-nv.dts +++ b/nv-platform/tegra234-p3737-0000+p3701-0005-nv.dts @@ -1,8 +1,12 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. /dts-v1/; -#include "staging/tegra234-p3737-0000+p3701-0005.dts" +#include "tegra234-p3737-0000+p3701-0000.dts" #include "tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi" #include "tegra234-p3701-0005.dtsi" + +/ { + compatible = "nvidia,p3737-0000+p3701-0005", "nvidia,p3701-0005", "nvidia,tegra234"; +}; diff --git a/nv-platform/tegra234-p3768-0000+p3767-0001-nv.dts b/nv-platform/tegra234-p3768-0000+p3767-0001-nv.dts index 4845df5..51ba4a9 100644 --- a/nv-platform/tegra234-p3768-0000+p3767-0001-nv.dts +++ b/nv-platform/tegra234-p3768-0000+p3767-0001-nv.dts @@ -1,7 +1,11 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. /dts-v1/; -#include "staging/tegra234-p3768-0000+p3767-0001.dts" +#include "tegra234-p3768-0000+p3767-0000.dts" #include "tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi" + +/ { + compatible = "nvidia,p3768-0000+p3767-0001", "nvidia,p3767-0001", "nvidia,tegra234"; +}; diff --git a/nv-platform/tegra234-p3768-0000+p3767-0003-nv.dts b/nv-platform/tegra234-p3768-0000+p3767-0003-nv.dts index d267fa5..26c319a 100644 --- a/nv-platform/tegra234-p3768-0000+p3767-0003-nv.dts +++ b/nv-platform/tegra234-p3768-0000+p3767-0003-nv.dts @@ -1,12 +1,14 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. /dts-v1/; -#include "staging/tegra234-p3768-0000+p3767-0003.dts" +#include "tegra234-p3768-0000+p3767-0005.dts" #include "tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi" / { + compatible = "nvidia,p3768-0000+p3767-0003", "nvidia,p3767-0003", "nvidia,tegra234"; + bus@0 { host1x@13e00000 { nvdla0@15880000 { diff --git a/nv-platform/tegra234-p3768-0000+p3767-0004-nv.dts b/nv-platform/tegra234-p3768-0000+p3767-0004-nv.dts index cc379b6..d1b7e85 100644 --- a/nv-platform/tegra234-p3768-0000+p3767-0004-nv.dts +++ b/nv-platform/tegra234-p3768-0000+p3767-0004-nv.dts @@ -1,12 +1,14 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. /dts-v1/; -#include "staging/tegra234-p3768-0000+p3767-0004.dts" +#include "tegra234-p3768-0000+p3767-0005.dts" #include "tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi" / { + compatible = "nvidia,p3768-0000+p3767-0004", "nvidia,p3767-0004", "nvidia,tegra234"; + bus@0 { host1x@13e00000 { nvdla0@15880000 { diff --git a/staging/Makefile b/staging/Makefile index a963576..160560f 100644 --- a/staging/Makefile +++ b/staging/Makefile @@ -9,12 +9,7 @@ dtb-y := dtbo-y := makefile-path := t23x/nv-public/staging -dtb-y += tegra234-p3737-0000+p3701-0004.dtb -dtb-y += tegra234-p3737-0000+p3701-0005.dtb dtb-y += tegra234-p3737-0000+p3701-0008.dtb -dtb-y += tegra234-p3768-0000+p3767-0001.dtb -dtb-y += tegra234-p3768-0000+p3767-0003.dtb -dtb-y += tegra234-p3768-0000+p3767-0004.dtb ifneq ($(dtb-y),) dtb-y := $(addprefix $(makefile-path)/,$(dtb-y)) diff --git a/staging/tegra234-p3737-0000+p3701-0004.dts b/staging/tegra234-p3737-0000+p3701-0004.dts deleted file mode 100644 index 60d6dac..0000000 --- a/staging/tegra234-p3737-0000+p3701-0004.dts +++ /dev/null @@ -1,13 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (c) 2023 NVIDIA CORPORATION. All rights reserved. - */ - -/dts-v1/; - -#include "tegra234-p3737-0000+p3701-0000.dts" - -/ { - model = "NVIDIA Jetson AGX Orin Developer Kit"; - compatible = "nvidia,p3737-0000+p3701-0004", "nvidia,p3701-0004", "nvidia,tegra234"; -}; diff --git a/staging/tegra234-p3737-0000+p3701-0005.dts b/staging/tegra234-p3737-0000+p3701-0005.dts deleted file mode 100644 index 865d7a6..0000000 --- a/staging/tegra234-p3737-0000+p3701-0005.dts +++ /dev/null @@ -1,13 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (c) 2023 NVIDIA CORPORATION. All rights reserved. - */ - -/dts-v1/; - -#include "tegra234-p3737-0000+p3701-0000.dts" - -/ { - model = "NVIDIA Jetson AGX Orin Developer Kit"; - compatible = "nvidia,p3737-0000+p3701-0005", "nvidia,p3701-0005", "nvidia,tegra234"; -}; diff --git a/staging/tegra234-p3768-0000+p3767-0001.dts b/staging/tegra234-p3768-0000+p3767-0001.dts deleted file mode 100644 index d98b5b4..0000000 --- a/staging/tegra234-p3768-0000+p3767-0001.dts +++ /dev/null @@ -1,13 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (c) 2023 NVIDIA CORPORATION. All rights reserved. - */ - -/dts-v1/; - -#include "tegra234-p3768-0000+p3767-0000.dts" - -/ { - compatible = "nvidia,p3768-0000+p3767-0001", "nvidia,p3767-0001", "nvidia,tegra234"; - model = "NVIDIA Jetson Orin NX Engineering Reference Developer Kit"; -}; diff --git a/staging/tegra234-p3768-0000+p3767-0003.dts b/staging/tegra234-p3768-0000+p3767-0003.dts deleted file mode 100644 index 1198537..0000000 --- a/staging/tegra234-p3768-0000+p3767-0003.dts +++ /dev/null @@ -1,13 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (c) 2023 NVIDIA CORPORATION. All rights reserved. - */ - -/dts-v1/; - -#include "tegra234-p3768-0000+p3767-0000.dts" - -/ { - compatible = "nvidia,p3768-0000+p3767-0003", "nvidia,p3767-0003", "nvidia,tegra234"; - model = "NVIDIA Jetson Orin NX Engineering Reference Developer Kit"; -}; diff --git a/staging/tegra234-p3768-0000+p3767-0004.dts b/staging/tegra234-p3768-0000+p3767-0004.dts deleted file mode 100644 index 05a9b12..0000000 --- a/staging/tegra234-p3768-0000+p3767-0004.dts +++ /dev/null @@ -1,13 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (c) 2023 NVIDIA CORPORATION. All rights reserved. - */ - -/dts-v1/; - -#include "tegra234-p3768-0000+p3767-0000.dts" - -/ { - compatible = "nvidia,p3768-0000+p3767-0004", "nvidia,p3767-0004", "nvidia,tegra234"; - model = "NVIDIA Jetson Orin NX Engineering Reference Developer Kit"; -};