overlay: p3740: absorb status file into top level dts

Make a few changes to improve the code:

1. Put the "status" file directly into the top level dts.
2. Combine all the fields from the status file into a single fragment.
3. Re-arrange fields in order by address.

Bug 4112434

Change-Id: I17c45bda32dbe803122071781d0e3ce27a0674fa
Signed-off-by: Brad Griffis <bgriffis@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/2914312
Reviewed-by: svcacv <svcacv@nvidia.com>
Reviewed-by: Shubhi Garg <shgarg@nvidia.com>
Reviewed-by: Bibek Basu <bbasu@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Brad Griffis
2023-06-01 17:50:05 +00:00
committed by mobile promotions
parent e65fddd15f
commit a34f16e561
2 changed files with 189 additions and 210 deletions

View File

@@ -1,209 +0,0 @@
// SPDX-License-Identifier: GPL-2.0-only
// Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// This files contains the status override of the DT nodes for overlay files.
/ {
fragment-t234-soc@0 {
__overlay__ {
bus@0 {
host1x@13e00000 {
nvdla0@15880000 {
status = "okay";
};
nvdla1@158c0000 {
status = "okay";
};
nvenc@154c0000 {
status = "okay";
};
nvjpg@15380000 {
status = "okay";
};
nvjpg@15540000 {
status = "okay";
};
ofa@15a50000 {
status = "okay";
};
pva0@16000000 {
status = "okay";
pva0_niso1_ctx0 {
status = "okay";
};
pva0_niso1_ctx1 {
status = "okay";
};
pva0_niso1_ctx2 {
status = "okay";
};
pva0_niso1_ctx3 {
status = "okay";
};
pva0_niso1_ctx4 {
status = "okay";
};
pva0_niso1_ctx5 {
status = "okay";
};
pva0_niso1_ctx6 {
status = "okay";
};
pva0_niso1_ctx7 {
status = "okay";
};
};
se@15810000 {
status = "okay";
};
se@15820000 {
status = "okay";
};
se@15840000 {
status = "okay";
};
tsec@15500000 {
status = "okay";
};
};
hsp@3c00000 {
status = "okay";
};
hsp@c150000 {
status = "okay";
};
hwpm@f100000 {
status = "okay";
};
mttcan@c310000 {
status = "okay";
};
mttcan@c320000 {
status = "okay";
};
pinmux@2430000 {
status = "okay";
};
serial@3110000 {
status = "okay";
};
tachometer@39c0000 {
status = "okay";
};
watchdog@2190000 {
status = "okay";
};
};
soctherm-oc-event {
status = "okay";
};
tegra-hsp@b950000 {
status = "okay";
};
};
};
fragment-t234-thermal@0 {
target-path = "/";
__overlay__ {
bpmp {
thermal {
status = "okay";
};
};
thermal-zones {
cpu-thermal {
status = "okay";
};
cv0-thermal {
status = "okay";
};
cv1-thermal {
status = "okay";
};
cv2-thermal {
status = "okay";
};
gpu-thermal {
status = "okay";
};
soc0-thermal {
status = "okay";
};
soc1-thermal {
status = "okay";
};
soc2-thermal {
status = "okay";
};
tj-thermal {
status = "okay";
};
};
};
};
fragment-t234-base@0 {
__overlay__ {
cpus {
idle-states {
c7 {
status = "okay";
};
};
};
};
};
fragment-t234-display@0 {
__overlay__ {
dce@d800000 {
status = "okay";
};
display@13800000 {
status = "okay";
};
};
};
};

View File

@@ -7,11 +7,199 @@
#include "tegra234-overlay.dtsi" #include "tegra234-overlay.dtsi"
#include "tegra234-soc-thermal.dtsi" #include "tegra234-soc-thermal.dtsi"
#include "tegra234-soc-thermal-shutdown.dtsi" #include "tegra234-soc-thermal-shutdown.dtsi"
#include "tegra234-p3740-0002+p3701-0008-status.dtsi"
#include "tegra234-p3740-0002.dtsi" #include "tegra234-p3740-0002.dtsi"
#include "tegra234-p3701-0008.dtsi" #include "tegra234-p3701-0008.dtsi"
#include "tegra234-dcb-p3737-0000-p3701-0000.dtsi" #include "tegra234-dcb-p3737-0000-p3701-0000.dtsi"
/ { / {
compatible = "nvidia,p3740-0002+p3701-0008"; compatible = "nvidia,p3740-0002+p3701-0008";
fragment-t234-p3740-p3701@0 {
target-path = "/";
__overlay__ {
bpmp {
thermal {
status = "okay";
};
};
cpus {
idle-states {
c7 {
status = "okay";
};
};
};
soctherm-oc-event {
status = "okay";
};
thermal-zones {
cpu-thermal {
status = "okay";
};
cv0-thermal {
status = "okay";
};
cv1-thermal {
status = "okay";
};
cv2-thermal {
status = "okay";
};
gpu-thermal {
status = "okay";
};
soc0-thermal {
status = "okay";
};
soc1-thermal {
status = "okay";
};
soc2-thermal {
status = "okay";
};
tj-thermal {
status = "okay";
};
};
bus@0 {
watchdog@2190000 {
status = "okay";
};
pinmux@2430000 {
status = "okay";
};
serial@3110000 {
status = "okay";
};
tachometer@39c0000 {
status = "okay";
};
hsp@3c00000 {
status = "okay";
};
hsp@c150000 {
status = "okay";
};
mttcan@c310000 {
status = "okay";
};
mttcan@c320000 {
status = "okay";
};
hwpm@f100000 {
status = "okay";
};
host1x@13e00000 {
nvjpg@15380000 {
status = "okay";
};
nvenc@154c0000 {
status = "okay";
};
tsec@15500000 {
status = "okay";
};
nvjpg@15540000 {
status = "okay";
};
se@15810000 {
status = "okay";
};
se@15820000 {
status = "okay";
};
se@15840000 {
status = "okay";
};
nvdla0@15880000 {
status = "okay";
};
nvdla1@158c0000 {
status = "okay";
};
ofa@15a50000 {
status = "okay";
};
pva0@16000000 {
status = "okay";
pva0_niso1_ctx0 {
status = "okay";
};
pva0_niso1_ctx1 {
status = "okay";
};
pva0_niso1_ctx2 {
status = "okay";
};
pva0_niso1_ctx3 {
status = "okay";
};
pva0_niso1_ctx4 {
status = "okay";
};
pva0_niso1_ctx5 {
status = "okay";
};
pva0_niso1_ctx6 {
status = "okay";
};
pva0_niso1_ctx7 {
status = "okay";
};
};
};
};
tegra-hsp@b950000 {
status = "okay";
};
dce@d800000 {
status = "okay";
};
display@13800000 {
status = "okay";
};
};
};
}; };