From c4a1279ddc2fe079eef6566cf0fce0fb85a8574f Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Tue, 4 Jul 2023 10:51:12 +0000 Subject: [PATCH] tegra234: p3701/p3767: Remove sku based override for compatibility There are base DTB based on the SKUs. Hence it is not required to override the compatible of the platform via the overlay as it can be done in base DTB only. Bug 4161664 Bug 4148987 Change-Id: If44e13821ed31de3ad2ef643d32d794648930d38 Signed-off-by: Laxman Dewangan Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/2930743 Reviewed-by: Brad Griffis GVS: Gerrit_Virtual_Submit --- overlay/tegra234-p3701-sku-handling.dtsi | 35 ----------------- overlay/tegra234-p3737-0000+p3701-0000.dts | 8 ---- overlay/tegra234-p3768-0000+p3767-0000.dts | 44 ---------------------- 3 files changed, 87 deletions(-) delete mode 100644 overlay/tegra234-p3701-sku-handling.dtsi diff --git a/overlay/tegra234-p3701-sku-handling.dtsi b/overlay/tegra234-p3701-sku-handling.dtsi deleted file mode 100644 index 372e840..0000000 --- a/overlay/tegra234-p3701-sku-handling.dtsi +++ /dev/null @@ -1,35 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -// Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. - -/ { - p3701-sku-handling-fragment@3 { - target-path = "/"; - board_config { - ids = "3737-0000-TS1","3737-0000-TS2","3737-0000-TS3","3737-0000-EB1","3737-0000-EB2","3737-0000-EB3","3737-0000-000","3737-0000-100","3737-0000-200"; - }; - __overlay__ { - compatible = "nvidia,p3737-0000+p3701-0000", "nvidia,p3701-0000", "nvidia,tegra234", "nvidia,tegra23x"; - }; - }; - - p3701-sku-handling-fragment@1 { - target-path = "/"; - board_config { - ids = "3701-0004-*"; - }; - __overlay__ { - compatible = "nvidia,p3737-0000+p3701-0004", "nvidia,p3701-0004", "nvidia,tegra234", "nvidia,tegra23x"; - }; - }; - - p3701-sku-handling-fragment@2 { - target-path = "/"; - board_config { - ids = "3701-0005-*"; - }; - __overlay__ { - compatible = "nvidia,p3737-0000+p3701-0005", "nvidia,p3701-0005", "nvidia,tegra234", "nvidia,tegra23x"; - }; - }; - -}; diff --git a/overlay/tegra234-p3737-0000+p3701-0000.dts b/overlay/tegra234-p3737-0000+p3701-0000.dts index 1bfd8d3..245e403 100644 --- a/overlay/tegra234-p3737-0000+p3701-0000.dts +++ b/overlay/tegra234-p3737-0000+p3701-0000.dts @@ -336,11 +336,3 @@ }; }; }; - -/* - * Include this file last in the device tree. It manages run-time - * pruning of peripherals that are not available across the various - * SKUs of p3701. For example PVA can be enabled in the device tree - * and it will automatically be disabled for SKUs without PVA support. - */ -#include "tegra234-p3701-sku-handling.dtsi" diff --git a/overlay/tegra234-p3768-0000+p3767-0000.dts b/overlay/tegra234-p3768-0000+p3767-0000.dts index 292bace..57e5810 100644 --- a/overlay/tegra234-p3768-0000+p3767-0000.dts +++ b/overlay/tegra234-p3768-0000+p3767-0000.dts @@ -252,50 +252,6 @@ }; }; }; - - fragment-t234-p3768-p3767@1 { - target-path = "/"; - board_config { - ids = "3767-0001-*"; - }; - __overlay__ { - compatible = "nvidia,p3768-0000+p3767-0001", "nvidia,p3767-0001", - "nvidia,tegra234"; - }; - }; - - fragment-t234-p3768-p3767@2 { - target-path = "/"; - board_config { - ids = "3767-0003-*"; - }; - __overlay__ { - compatible = "nvidia,p3768-0000+p3767-0003", "nvidia,p3767-0003", - "nvidia,tegra234"; - }; - }; - - fragment-t234-p3768-p3767@3 { - target-path = "/"; - board_config { - ids = "3767-0004-*"; - }; - __overlay__ { - compatible = "nvidia,p3768-0000+p3767-0004", "nvidia,p3767-0004", - "nvidia,tegra234"; - }; - }; - - fragment-t234-p3768-p3767@4 { - target-path = "/"; - board_config { - ids = "3767-0005-*"; - }; - __overlay__ { - compatible = "nvidia,p3768-0000+p3767-0005", "nvidia,p3767-0005", - "nvidia,tegra234"; - }; - }; }; /*