diff --git a/include/dt-bindings/interconnect/tegra_icc_id.h b/include/dt-bindings/interconnect/tegra_icc_id.h
index 1a8e0622..936872f5 100644
--- a/include/dt-bindings/interconnect/tegra_icc_id.h
+++ b/include/dt-bindings/interconnect/tegra_icc_id.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2020-2022, NVIDIA CORPORATION & AFFILIATES. 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 <http://www.gnu.org/licenses/>.
+ * Copyright (c) 2020-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
 
 #ifndef _DT_BINDINGS_TEGRA_ICC_ID_H
diff --git a/include/linux/tegra-prod.h b/include/linux/tegra-prod.h
index f5043e23..970dec18 100644
--- a/include/linux/tegra-prod.h
+++ b/include/linux/tegra-prod.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2014-2021, 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 <http://www.gnu.org/licenses/>.
+ * Copyright (c) 2014-2023, NVIDIA CORPORATION.  All rights reserved.
  */
 
 #ifndef _TEGRA_PRODS_H
diff --git a/include/linux/tegra_vnet.h b/include/linux/tegra_vnet.h
index f02732f7..df8afc14 100644
--- a/include/linux/tegra_vnet.h
+++ b/include/linux/tegra_vnet.h
@@ -1,14 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2020-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.
+ * Copyright (c) 2020-2023, NVIDIA CORPORATION.  All rights reserved.
  */
 
 #ifndef PCIE_EPF_TEGRA_DMA_H
diff --git a/include/trace/events/tegra_capture.h b/include/trace/events/tegra_capture.h
index 9f55c928..ab0e9b98 100644
--- a/include/trace/events/tegra_capture.h
+++ b/include/trace/events/tegra_capture.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. 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 <http://www.gnu.org/licenses/>.
  */
 
 #undef TRACE_SYSTEM
diff --git a/include/uapi/linux/nvdev_fence.h b/include/uapi/linux/nvdev_fence.h
index bfa8bed7..c9182c6d 100644
--- a/include/uapi/linux/nvdev_fence.h
+++ b/include/uapi/linux/nvdev_fence.h
@@ -1,22 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * include/uapi/linux/nvdev_fence.h
+ * Copyright (c) 2018-2023, NVIDIA Corporation.  All rights reserved.
  *
  * Tegra PVA/DLA fence support
- *
- * Copyright (c) 2018-2021, NVIDIA Corporation.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that 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 <http://www.gnu.org/licenses/>.
  */
 
 #ifndef LINUX_NVDEV_FENCE_H