diff --git a/arch/arm64/boot/dts/nvidia/Makefile b/arch/arm64/boot/dts/nvidia/Makefile index 5d5d4583..1f01f110 100644 --- a/arch/arm64/boot/dts/nvidia/Makefile +++ b/arch/arm64/boot/dts/nvidia/Makefile @@ -1,10 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. DTC_FLAGS += -@ # DT overlays -dtbo-y += tegra-optee.dtbo dtbo-y += tegra194-carveouts.dtbo dtbo-y += tegra194-jetson.dtbo dtbo-y += tegra194-p3509-0000+p3668-0001-overlay.dtbo diff --git a/arch/arm64/boot/dts/nvidia/tegra-optee.dts b/arch/arm64/boot/dts/nvidia/tegra-optee.dts deleted file mode 100644 index c224638b..00000000 --- a/arch/arm64/boot/dts/nvidia/tegra-optee.dts +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* - * Jetson Device-tree overlay for OP-TEE. - */ - -/dts-v1/; -/plugin/; - -/ { - overlay-name = "OP-TEE overlay"; - compatible = "nvidia,tegra194", "nvidia,tegra234"; - - fragment@0 { - target-path = "/"; - board_config { - sw-modules = "kernel"; - }; - __overlay__ { - firmware { - optee { - compatible = "linaro,optee-tz"; - method = "smc"; - status = "disabled"; - }; - }; - }; - }; -};