nv-public: remove REMOVE_FRAGMENT_SYNTAX

These preprocessor conditionals were a temporary step to facilitate
step by step reviews.  Remove them.

Delete display overlay includes from tegra234-jetson.dts since the
formatting no longer is correct for an overlay.  This file
tegra234-jetson.dts is planned for removal in the near future.

Indentation will be fixed in a follow-on patch to make reviews easier.

Bug 4290389

Change-Id: Ia6a0e240a96823e989e994d5564a7f0ad94061cc
Signed-off-by: Brad Griffis <bgriffis@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/3005701
Reviewed-by: svcacv <svcacv@nvidia.com>
Reviewed-by: Jonathan Hunter <jonathanh@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Brad Griffis
2023-10-28 13:08:30 +00:00
committed by mobile promotions
parent 2f14d2d18f
commit ef304f6995
36 changed files with 0 additions and 239 deletions

View File

@@ -6,11 +6,6 @@
#define CAM0_PWDN TEGRA234_AON_GPIO(AA, 4)
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
fragment-camera@0 {
target-path = "/";
__overlay__ {
#endif
gpio@c2f0000 {
camera-control-output-high {
gpio-hog;
@@ -404,8 +399,4 @@
};
};
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -2,11 +2,6 @@
// SPDX-FileCopyrightText: Copyright (c) 2021-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
fragment-t234-dcb@0 {
target-path = "/";
__overlay__ {
#endif
display@13800000 {
nvidia,dcb-image = [
55 aa 16 00 00 37 34 30 30 e9 4c 19 77 cc 56 49
@@ -536,8 +531,4 @@
40 00 00 00 00 00 00 06 00 00 00 00 00 05 05 00
00 00 00 00 00 00 00 ];
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -2,11 +2,6 @@
// SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
fragment-p3701-prod@0 {
target-path = "/";
__overlay__ {
#endif
bus@0 {
aon@c000000 {
prod-settings {
@@ -324,8 +319,4 @@
};
};
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -4,11 +4,6 @@
#include "tegra234-p3701-0000-prod-overlay.dtsi"
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
fragment-t234-p3701-0000@0 {
target-path = "/";
__overlay__ {
#endif
bus@0 {
i2c@c240000 {
ina3221@40 {
@@ -151,8 +146,4 @@
status = "okay";
};
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -2,11 +2,6 @@
// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
fragment-t234-p3701-0008@0 {
target-path = "/";
__overlay__ {
#endif
bus@0 {
i2c@c240000 {
ina3221@40 {
@@ -292,8 +287,4 @@
status = "okay";
};
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -3,6 +3,5 @@
/dts-v1/;
#define REMOVE_FRAGMENT_SYNTAX 1
#include "tegra234-p3737-0000+p3701-0000.dts"
#include "tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi"

View File

@@ -3,6 +3,5 @@
/dts-v1/;
#define REMOVE_FRAGMENT_SYNTAX 1
#include "staging/tegra234-p3737-0000+p3701-0004.dts"
#include "tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi"

View File

@@ -3,6 +3,5 @@
/dts-v1/;
#define REMOVE_FRAGMENT_SYNTAX 1
#include "staging/tegra234-p3737-0000+p3701-0005.dts"
#include "tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi"

View File

@@ -3,6 +3,5 @@
/dts-v1/;
#define REMOVE_FRAGMENT_SYNTAX 1
#include "staging/tegra234-p3737-0000+p3701-0008.dts"
#include "tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi"

View File

@@ -12,12 +12,6 @@
#include "tegra234-dcb-p3737-0000-p3701-0000.dtsi"
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
compatible = "nvidia,p3737-0000+p3701-0000";
fragment-t234-p3737-p3701@0 {
target-path = "/";
__overlay__ {
#endif
cpus {
idle-states {
c7 {
@@ -333,8 +327,4 @@
display@13800000 {
status = "okay";
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -2,11 +2,6 @@
// SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
fragment-t234-p3737-0000@0 {
target-path = "/";
__overlay__ {
#endif
bus@0 {
spi@3210000{ /* SPI1 in 40 pin conn */
spi@0 { /* chip select 0 */
@@ -127,8 +122,4 @@
};
};
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -12,13 +12,6 @@
#include "tegra234-dcb-p3737-0000-p3701-0000.dtsi"
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
compatible = "nvidia,p3740-0002+p3701-0008";
fragment-t234-p3740-p3701@0 {
target-path = "/";
__overlay__ {
#endif
chosen {
bootargs = "console=ttyTCU0,115200n8";
};
@@ -291,8 +284,4 @@
display@13800000 {
status = "okay";
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -3,7 +3,6 @@
/dts-v1/;
#define REMOVE_FRAGMENT_SYNTAX 1
#include "tegra234-p3740-0002+p3701-0008.dts"
#include "tegra234-p3740-0002+p3701-0008-nv-common.dtsi"
#include "tegra234-p3740-0002+p3701-0008-safety.dtsi"

View File

@@ -3,6 +3,5 @@
/dts-v1/;
#define REMOVE_FRAGMENT_SYNTAX 1
#include "tegra234-p3740-0002+p3701-0008.dts"
#include "tegra234-p3740-0002+p3701-0008-nv-common.dtsi"

View File

@@ -4,11 +4,6 @@
#include "nv-soc/tegra234-soc-safetyservice-fsicom.dtsi"
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
fragment-t234-p3740-p3701-safety@0 {
target-path = "/";
__overlay__ {
#endif
compatible = "nvidia,p3740-0002+p3701-0008", "safety", "nvidia,p3701-0008", "nvidia,tegra234";
bus@0 {
@@ -222,8 +217,4 @@
};
};
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -4,11 +4,6 @@
#include "nv-soc/tegra234-soc-audio-dai-links.dtsi"
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
fragment-t234-p3740-0002@0 {
target-path = "/";
__overlay__ {
#endif
bus@0 {
i2c@31c0000 {
typec: stusb1600@28 {
@@ -233,8 +228,4 @@
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -6,12 +6,6 @@
#include <dt-bindings/interrupt/tegra234-irq.h>
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
p3767-0000-fragment@0 {
target-path = "/";
__overlay__ {
#endif
bus@0 {
mmc@3400000 {
no-sdio;
@@ -80,8 +74,4 @@
status = "okay";
};
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -3,6 +3,5 @@
/dts-v1/;
#define REMOVE_FRAGMENT_SYNTAX 1
#include "tegra234-p3768-0000+p3767-0000.dts"
#include "tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi"

View File

@@ -3,6 +3,5 @@
/dts-v1/;
#define REMOVE_FRAGMENT_SYNTAX 1
#include "staging/tegra234-p3768-0000+p3767-0001.dts"
#include "tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi"

View File

@@ -3,6 +3,5 @@
/dts-v1/;
#define REMOVE_FRAGMENT_SYNTAX 1
#include "staging/tegra234-p3768-0000+p3767-0003.dts"
#include "tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi"

View File

@@ -3,6 +3,5 @@
/dts-v1/;
#define REMOVE_FRAGMENT_SYNTAX 1
#include "staging/tegra234-p3768-0000+p3767-0004.dts"
#include "tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi"

View File

@@ -3,6 +3,5 @@
/dts-v1/;
#define REMOVE_FRAGMENT_SYNTAX 1
#include "tegra234-p3768-0000+p3767-0005.dts"
#include "tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi"

View File

@@ -11,13 +11,6 @@
#include "nv-soc/tegra234-soc-camera.dtsi"
#include "tegra234-dcb-p3737-0000-p3701-0000.dtsi"
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
overlay-name = "Tegra234 P3768-0000+P3767-0000 Overlay";
fragment-t234-p3768-p3767@0 {
target-path = "/";
__overlay__ {
#endif
bpmp {
i2c {
vrs@3c {
@@ -454,8 +447,4 @@
display@13800000 {
status = "okay";
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -2,11 +2,6 @@
// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
fragment-t234-p3768-0000@0 {
target-path = "/";
__overlay__ {
#endif
bus@0 {
aconnect@2900000 {
@@ -38,8 +33,4 @@
hdr40_snd_link_i2s: nvidia-audio-card,dai-link@77 { };
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -21,14 +21,6 @@
#define TEGRA234_POWER_DOMAIN_DLAB 33U
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
overlay-name = "Add nvidia,t234 Overlay Support";
compatible = "nvidia,tegra234";
fragment-t234-base@0 {
target-path = "/";
__overlay__ {
#endif
aliases {
serial0 = "/bus@0/serial@3100000";
serial1 = "/bus@0/serial@3110000";
@@ -801,8 +793,4 @@
nvidia,vm-irq-id = <3>;
};
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -7,11 +7,6 @@
#define ADMAIF_CIF(i) (TEGRA186_ADMAIF_CIF_OFFSET + i - 1)
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
fragment-audio-links@0 {
target-path = "/";
__overlay__ {
#endif
sound {
/* ADMAIF <--> XBAR PCM links */
admaif1_pcm_link: nvidia-audio-card,dai-link@0 {
@@ -2278,8 +2273,4 @@
};
};
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -12,11 +12,6 @@
#include <dt-bindings/memory/tegra234-mc.h>
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
fragment-camera@0 {
target-path = "/";
__overlay__ {
#endif
aliases { /* RCE is the Camera RTCPU */
tegra-camera-rtcpu = "/rtcpu@bc00000";
};
@@ -266,8 +261,4 @@
status = "disabled";
};
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -4,12 +4,6 @@
#include <dt-bindings/power/tegra234-powergate.h>
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
fragment-t234-display@0 {
target-path = "/";
__overlay__ {
#endif
dce@d800000 {
compatible = "nvidia,tegra234-dce";
reg = <0x0 0x0d800000 0x0 0x00800000>;
@@ -181,8 +175,4 @@
dma-coherent;
};
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -16,11 +16,6 @@
#include <dt-bindings/pinctrl/pinctrl-tegra.h>
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
fragment-t234-soc@0 {
target-path = "/";
__overlay__ {
#endif
aliases {
nvdla0 = "/bus@0/host1x@13e00000/nvdla0@15880000";
nvdla1 = "/bus@0/host1x@13e00000/nvdla1@158c0000";
@@ -1006,8 +1001,4 @@
status = "disabled";
};
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -2,11 +2,6 @@
// SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
fragment-t234-soc-prod@0 {
target-path = "/";
__overlay__ {
#endif
bus@0 {
i2c@3160000 {
prod-settings {
@@ -832,8 +827,4 @@
};
};
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -5,11 +5,6 @@
#include <dt-bindings/memory/tegra234-mc.h>
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
fragment-fsicom@0 {
target-path = "/";
__overlay__ {
#endif
reserved-memory {
#address-cells = <2>;
#size-cells = <2>;
@@ -149,8 +144,4 @@
status = "disabled";
channelid_list = <0>;
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -4,11 +4,6 @@
#define TEGRA234_THERMAL_SHUTDOWN_TEMP 104500
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
fragment-t234-thermal-shutdown@0 {
target-path = "/";
__overlay__ {
#endif
thermal-zones {
cpu-thermal {
trips {
@@ -100,8 +95,4 @@
};
};
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -6,11 +6,6 @@
#define TEGRA234_THERMAL_SLOWDOWN_TEMP 99000
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
fragment-t234-thermal-slowdown-cluster@0 {
target-path = "/";
__overlay__ {
#endif
bus@0 {
gpu@17000000 {
#cooling-cells = <2>;
@@ -224,8 +219,4 @@
};
};
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -6,11 +6,6 @@
#define TEGRA234_THERMAL_SLOWDOWN_TEMP 99000
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
fragment-t234-thermal-slowdown-corepair@0 {
target-path = "/";
__overlay__ {
#endif
bus@0 {
gpu@17000000 {
#cooling-cells = <2>;
@@ -260,8 +255,4 @@
};
};
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -4,11 +4,6 @@
#define TEGRA234_THERMAL_POLLING_DELAY 1000
/ {
#ifndef REMOVE_FRAGMENT_SYNTAX
fragment-t234-thermal@0 {
target-path = "/";
__overlay__ {
#endif
thermal-zones {
cpu-thermal {
polling-delay = <TEGRA234_THERMAL_POLLING_DELAY>;
@@ -55,8 +50,4 @@
polling-delay-passive = <TEGRA234_THERMAL_POLLING_DELAY>;
};
};
#ifndef REMOVE_FRAGMENT_SYNTAX
};
};
#endif
};

View File

@@ -11,8 +11,6 @@
#include <dt-bindings/memory/tegra234-mc.h>
#include <dt-bindings/power/tegra234-powergate.h>
#include <dt-bindings/reset/tegra234-reset.h>
#include "nv-soc/tegra234-soc-display-overlay.dtsi"
#include "nv-platform/tegra234-dcb-p3737-0000-p3701-0000.dtsi"
/ {
overlay-name = "Tegra234 Jetson Overlay";