t23x: nv-public: clean up staging directory

There is no need to upstream the following files:

tegra234-p3737-0000+p3701-0004.dts
tegra234-p3737-0000+p3701-0005.dts
tegra234-p3768-0000+p3767-0001.dts
tegra234-p3768-0000+p3767-0003.dts
tegra234-p3768-0000+p3767-0004.dts

The differences between those files and the variants that already
exist upstream are limited to things that do not require dts
changes. For example differences in DRAM size are handled by
MEM-BCT.  Differences in available accelerators are managed by
UEFI. Therefore we will not be upstreaming these files and so
correspondingly remove them from the staging directory.

These staging files were modifying the compatible string to
correspond with the precise SKU being used. The *-nv.dts files
have been updated to retain those compatible strings.

Note that p3701-0008 remains in the staging folder as there is an
active effort underway to get that upstreamed. So using
"nvidia,p3701-0008" for AGX Orin Industrial is still appropriate
as there are differences in the dtb implementation for that particular
SKU, e.g. temperature thresholds are different.

Bug 4707773

Change-Id: I213c2f4fb4685f4fc02a376ad023be357edf1e52
Signed-off-by: Brad Griffis <bgriffis@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/3218769
(cherry picked from commit a80675405f)
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/3260396
Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Brad Griffis
2024-09-25 13:45:45 +00:00
committed by mobile promotions
parent e96aba03cf
commit 3812f9c73a
11 changed files with 26 additions and 80 deletions

View File

@@ -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";
};

View File

@@ -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";
};

View File

@@ -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";
};

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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))

View File

@@ -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";
};

View File

@@ -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";
};

View File

@@ -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";
};

View File

@@ -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";
};

View File

@@ -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";
};