diff --git a/drivers/video/tegra/host/pva/elf_include_fix.h b/drivers/video/tegra/host/pva/elf_include_fix.h
index b4e4ad9d..75a0cbb7 100644
--- a/drivers/video/tegra/host/pva/elf_include_fix.h
+++ b/drivers/video/tegra/host/pva/elf_include_fix.h
@@ -1,21 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * 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 <http://www.gnu.org/licenses/>.
+ * Copyright (c) 2022-2023, NVIDIA CORPORATION. All rights reserved.
  */
 
-
 #ifndef ELF_INCLUDE_FIX_H
 #undef ELF_INCLUDE_FIX_H
 
diff --git a/drivers/video/tegra/host/pva/fw_include/fw_config.h b/drivers/video/tegra/host/pva/fw_include/fw_config.h
index 9545c17a..3d1163df 100644
--- a/drivers/video/tegra/host/pva/fw_include/fw_config.h
+++ b/drivers/video/tegra/host/pva/fw_include/fw_config.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016-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) 2016-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #ifndef PVA_CONFIG_H
diff --git a/drivers/video/tegra/host/pva/fw_include/pva-bit.h b/drivers/video/tegra/host/pva/fw_include/pva-bit.h
index bf24551b..f4d13fe5 100644
--- a/drivers/video/tegra/host/pva/fw_include/pva-bit.h
+++ b/drivers/video/tegra/host/pva/fw_include/pva-bit.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016-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) 2016-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #ifndef PVA_BIT_H
diff --git a/drivers/video/tegra/host/pva/fw_include/pva-errors.h b/drivers/video/tegra/host/pva/fw_include/pva-errors.h
index e8ea7aed..95c682a4 100644
--- a/drivers/video/tegra/host/pva/fw_include/pva-errors.h
+++ b/drivers/video/tegra/host/pva/fw_include/pva-errors.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016-2023, 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) 2016-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #ifndef PVA_ERRORS_H
diff --git a/drivers/video/tegra/host/pva/fw_include/pva-fw-address-map.h b/drivers/video/tegra/host/pva/fw_include/pva-fw-address-map.h
index 1ebde4dd..a5243409 100644
--- a/drivers/video/tegra/host/pva/fw_include/pva-fw-address-map.h
+++ b/drivers/video/tegra/host/pva/fw_include/pva-fw-address-map.h
@@ -1,18 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * 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 <http://www.gnu.org/licenses/>.
+ * Copyright (c) 2022-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #ifndef PVA_FW_ADDRESS_MAP_H
diff --git a/drivers/video/tegra/host/pva/fw_include/pva-fw-version.h b/drivers/video/tegra/host/pva/fw_include/pva-fw-version.h
index dcbcc896..9070f64c 100644
--- a/drivers/video/tegra/host/pva/fw_include/pva-fw-version.h
+++ b/drivers/video/tegra/host/pva/fw_include/pva-fw-version.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016-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) 2016-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #ifndef PVA_FW_VERSION_H
diff --git a/drivers/video/tegra/host/pva/fw_include/pva-interface.h b/drivers/video/tegra/host/pva/fw_include/pva-interface.h
index 05726a18..346eb91c 100644
--- a/drivers/video/tegra/host/pva/fw_include/pva-interface.h
+++ b/drivers/video/tegra/host/pva/fw_include/pva-interface.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016-2023, 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) 2016-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #ifndef PVA_INTERFACE_H
diff --git a/drivers/video/tegra/host/pva/fw_include/pva-packed.h b/drivers/video/tegra/host/pva/fw_include/pva-packed.h
index acdd9520..178e1d4c 100644
--- a/drivers/video/tegra/host/pva/fw_include/pva-packed.h
+++ b/drivers/video/tegra/host/pva/fw_include/pva-packed.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016-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) 2016-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #ifndef PVA_PACKED_H
diff --git a/drivers/video/tegra/host/pva/fw_include/pva-sys-dma.h b/drivers/video/tegra/host/pva/fw_include/pva-sys-dma.h
index cb7c4d2b..49f82a8e 100644
--- a/drivers/video/tegra/host/pva/fw_include/pva-sys-dma.h
+++ b/drivers/video/tegra/host/pva/fw_include/pva-sys-dma.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2020-2023, 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) 2020-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 /**
diff --git a/drivers/video/tegra/host/pva/fw_include/pva-sys-params.h b/drivers/video/tegra/host/pva/fw_include/pva-sys-params.h
index 94456d10..559e647a 100644
--- a/drivers/video/tegra/host/pva/fw_include/pva-sys-params.h
+++ b/drivers/video/tegra/host/pva/fw_include/pva-sys-params.h
@@ -1,17 +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.
- *
- * 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.  All rights reserved.
  */
 
 /**
diff --git a/drivers/video/tegra/host/pva/fw_include/pva-task.h b/drivers/video/tegra/host/pva/fw_include/pva-task.h
index 4981cdd8..ee1d89da 100644
--- a/drivers/video/tegra/host/pva/fw_include/pva-task.h
+++ b/drivers/video/tegra/host/pva/fw_include/pva-task.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016-2023, 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) 2020-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #ifndef PVA_TASK_H
diff --git a/drivers/video/tegra/host/pva/fw_include/pva-types.h b/drivers/video/tegra/host/pva/fw_include/pva-types.h
index 1caff658..aca92997 100644
--- a/drivers/video/tegra/host/pva/fw_include/pva-types.h
+++ b/drivers/video/tegra/host/pva/fw_include/pva-types.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016-2023, 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) 2016-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #ifndef PVA_TYPES_H
diff --git a/drivers/video/tegra/host/pva/fw_include/pva-ucode-header-types.h b/drivers/video/tegra/host/pva/fw_include/pva-ucode-header-types.h
index 71c8d548..83193365 100644
--- a/drivers/video/tegra/host/pva/fw_include/pva-ucode-header-types.h
+++ b/drivers/video/tegra/host/pva/fw_include/pva-ucode-header-types.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016-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) 2016-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #ifndef PVA_UCODE_HEADER_TYPES_H
diff --git a/drivers/video/tegra/host/pva/fw_include/pva-ucode-header.h b/drivers/video/tegra/host/pva/fw_include/pva-ucode-header.h
index bdbd8516..b74d6f38 100644
--- a/drivers/video/tegra/host/pva/fw_include/pva-ucode-header.h
+++ b/drivers/video/tegra/host/pva/fw_include/pva-ucode-header.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016-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) 2016-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #ifndef PVA_UCODE_HEADER_H
diff --git a/drivers/video/tegra/host/pva/fw_include/pva-version.h b/drivers/video/tegra/host/pva/fw_include/pva-version.h
index 9f4a84ea..e481db26 100644
--- a/drivers/video/tegra/host/pva/fw_include/pva-version.h
+++ b/drivers/video/tegra/host/pva/fw_include/pva-version.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016-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) 2016-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #ifndef PVA_VERSION_H
diff --git a/drivers/video/tegra/host/pva/hw_cfg_pva_v1.h b/drivers/video/tegra/host/pva/hw_cfg_pva_v1.h
index c81582bb..1972a9da 100644
--- a/drivers/video/tegra/host/pva/hw_cfg_pva_v1.h
+++ b/drivers/video/tegra/host/pva/hw_cfg_pva_v1.h
@@ -1,19 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016-2019, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2023, 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/>.
- */
-/*
  * Function naming determines intended use:
  *
  *     <x>_r(void) : Returns the offset for register <x>.
diff --git a/drivers/video/tegra/host/pva/hw_cfg_pva_v2.h b/drivers/video/tegra/host/pva/hw_cfg_pva_v2.h
index 98224875..c6ffde85 100644
--- a/drivers/video/tegra/host/pva/hw_cfg_pva_v2.h
+++ b/drivers/video/tegra/host/pva/hw_cfg_pva_v2.h
@@ -1,19 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2019, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2019-2023, 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/>.
- */
-/*
  * Function naming determines intended use:
  *
  *     <x>_r(void) : Returns the offset for register <x>.
diff --git a/drivers/video/tegra/host/pva/hw_dma_ch_pva.h b/drivers/video/tegra/host/pva/hw_dma_ch_pva.h
index 91616865..055aa691 100644
--- a/drivers/video/tegra/host/pva/hw_dma_ch_pva.h
+++ b/drivers/video/tegra/host/pva/hw_dma_ch_pva.h
@@ -1,19 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2023, 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/>.
- */
-/*
  * Function naming determines intended use:
  *
  *     <x>_r(void) : Returns the offset for register <x>.
diff --git a/drivers/video/tegra/host/pva/hw_dma_desc_pva.h b/drivers/video/tegra/host/pva/hw_dma_desc_pva.h
index 9c670a8e..4205b5b8 100644
--- a/drivers/video/tegra/host/pva/hw_dma_desc_pva.h
+++ b/drivers/video/tegra/host/pva/hw_dma_desc_pva.h
@@ -1,19 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2023, 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/>.
- */
-/*
  * Function naming determines intended use:
  *
  *     <x>_r(void) : Returns the offset for register <x>.
diff --git a/drivers/video/tegra/host/pva/hw_evp_pva.h b/drivers/video/tegra/host/pva/hw_evp_pva.h
index 8732c5c3..97b6b5b7 100644
--- a/drivers/video/tegra/host/pva/hw_evp_pva.h
+++ b/drivers/video/tegra/host/pva/hw_evp_pva.h
@@ -1,19 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2023, 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/>.
- */
-/*
  * Function naming determines intended use:
  *
  *     <x>_r(void) : Returns the offset for register <x>.
diff --git a/drivers/video/tegra/host/pva/hw_hsp_pva.h b/drivers/video/tegra/host/pva/hw_hsp_pva.h
index 62e6cab0..83667153 100644
--- a/drivers/video/tegra/host/pva/hw_hsp_pva.h
+++ b/drivers/video/tegra/host/pva/hw_hsp_pva.h
@@ -1,19 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2023, 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/>.
- */
-/*
  * Function naming determines intended use:
  *
  *     <x>_r(void) : Returns the offset for register <x>.
diff --git a/drivers/video/tegra/host/pva/hw_proc_pva.h b/drivers/video/tegra/host/pva/hw_proc_pva.h
index e4c6145d..37f06138 100644
--- a/drivers/video/tegra/host/pva/hw_proc_pva.h
+++ b/drivers/video/tegra/host/pva/hw_proc_pva.h
@@ -1,19 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2023, 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/>.
- */
-/*
  * Function naming determines intended use:
  *
  *     <x>_r(void) : Returns the offset for register <x>.
diff --git a/drivers/video/tegra/host/pva/hw_sec_pva_v1.h b/drivers/video/tegra/host/pva/hw_sec_pva_v1.h
index 36b19893..576fee0b 100644
--- a/drivers/video/tegra/host/pva/hw_sec_pva_v1.h
+++ b/drivers/video/tegra/host/pva/hw_sec_pva_v1.h
@@ -1,19 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016-2019, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2023, 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/>.
- */
-/*
  * Function naming determines intended use:
  *
  *     <x>_r(void) : Returns the offset for register <x>.
diff --git a/drivers/video/tegra/host/pva/hw_sec_pva_v2.h b/drivers/video/tegra/host/pva/hw_sec_pva_v2.h
index 826a67a6..a30e7364 100644
--- a/drivers/video/tegra/host/pva/hw_sec_pva_v2.h
+++ b/drivers/video/tegra/host/pva/hw_sec_pva_v2.h
@@ -1,19 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2019-2020, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2019-2023, 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/>.
- */
-/*
  * Function naming determines intended use:
  *
  *     <x>_r(void) : Returns the offset for register <x>.
diff --git a/drivers/video/tegra/host/pva/hw_vmem_pva.h b/drivers/video/tegra/host/pva/hw_vmem_pva.h
index 561d833b..1c3fefac 100644
--- a/drivers/video/tegra/host/pva/hw_vmem_pva.h
+++ b/drivers/video/tegra/host/pva/hw_vmem_pva.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 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) 2021-2023, NVIDIA CORPORATION. All rights reserved.
  */
 
 #ifndef _hw_vmem_pva_h_
diff --git a/drivers/video/tegra/host/pva/nvpva_buffer.c b/drivers/video/tegra/host/pva/nvpva_buffer.c
index 6de707b4..ccf25e81 100644
--- a/drivers/video/tegra/host/pva/nvpva_buffer.c
+++ b/drivers/video/tegra/host/pva/nvpva_buffer.c
@@ -1,18 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2016-2023, 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/>.
  */
 
 #include <linux/platform_device.h>
diff --git a/drivers/video/tegra/host/pva/nvpva_buffer.h b/drivers/video/tegra/host/pva/nvpva_buffer.h
index 2a535533..d4c64a7f 100644
--- a/drivers/video/tegra/host/pva/nvpva_buffer.h
+++ b/drivers/video/tegra/host/pva/nvpva_buffer.h
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
+ * Copyright (c) 2016-2023, NVIDIA CORPORATION. All rights reserved.
+ *
  * NVPVA Buffer Management Header
- *
- * Copyright (c) 2016-2023, 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/>.
  */
 
 #ifndef __NVPVA_NVPVA_BUFFER_H__
diff --git a/drivers/video/tegra/host/pva/nvpva_client.c b/drivers/video/tegra/host/pva/nvpva_client.c
index 04537871..7ad0df75 100644
--- a/drivers/video/tegra/host/pva/nvpva_client.c
+++ b/drivers/video/tegra/host/pva/nvpva_client.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2021-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 <http://www.gnu.org/licenses/>.
+ * Copyright (c) 2021-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #include <linux/mutex.h>
diff --git a/drivers/video/tegra/host/pva/nvpva_client.h b/drivers/video/tegra/host/pva/nvpva_client.h
index 1b217ede..37203721 100644
--- a/drivers/video/tegra/host/pva/nvpva_client.h
+++ b/drivers/video/tegra/host/pva/nvpva_client.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2021-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 <http://www.gnu.org/licenses/>.
+ * Copyright (c) 2021-2023, NVIDIA CORPORATION. All rights reserved.
  */
 
 #ifndef NVPVA_CLIENT_H
diff --git a/drivers/video/tegra/host/pva/nvpva_elf_parser.c b/drivers/video/tegra/host/pva/nvpva_elf_parser.c
index bb69ba6b..e2a348f8 100644
--- a/drivers/video/tegra/host/pva/nvpva_elf_parser.c
+++ b/drivers/video/tegra/host/pva/nvpva_elf_parser.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 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) 2021-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #if IS_ENABLED(CONFIG_TEGRA_GRHOST)
diff --git a/drivers/video/tegra/host/pva/nvpva_elf_parser.h b/drivers/video/tegra/host/pva/nvpva_elf_parser.h
index c9242a19..a83c506c 100644
--- a/drivers/video/tegra/host/pva/nvpva_elf_parser.h
+++ b/drivers/video/tegra/host/pva/nvpva_elf_parser.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 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) 2021-2023, NVIDIA CORPORATION. All rights reserved.
  */
 
 #ifndef NVPVA_ELF_PARSER_H
diff --git a/drivers/video/tegra/host/pva/nvpva_queue.c b/drivers/video/tegra/host/pva/nvpva_queue.c
index f61cd406..cc942dfa 100644
--- a/drivers/video/tegra/host/pva/nvpva_queue.c
+++ b/drivers/video/tegra/host/pva/nvpva_queue.c
@@ -1,18 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
+ * Copyright (c) 2021-2023, NVIDIA Corporation.  All rights reserved.
+ *
  * NVHOST queue management for T194
- *
- * Copyright (c) 2021-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/>.
  */
 
 #include <linux/platform_device.h>
diff --git a/drivers/video/tegra/host/pva/nvpva_queue.h b/drivers/video/tegra/host/pva/nvpva_queue.h
index c4924f5e..c069ac72 100644
--- a/drivers/video/tegra/host/pva/nvpva_queue.h
+++ b/drivers/video/tegra/host/pva/nvpva_queue.h
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
+ * Copyright (c) 2021-2023, NVIDIA CORPORATION. All rights reserved.
+ *
  * NVPVA Queue management header for T194 and T234
- *
- * Copyright (c) 2021-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/>.
  */
 
 #ifndef __NVPVA_NVPVA_QUEUE_H__
diff --git a/drivers/video/tegra/host/pva/nvpva_syncpt.c b/drivers/video/tegra/host/pva/nvpva_syncpt.c
index 5bbd7b78..62ae7ed5 100644
--- a/drivers/video/tegra/host/pva/nvpva_syncpt.c
+++ b/drivers/video/tegra/host/pva/nvpva_syncpt.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2022-2023, 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/>.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/video/tegra/host/pva/nvpva_syncpt.h b/drivers/video/tegra/host/pva/nvpva_syncpt.h
index d6d2bccb..7fcf56d9 100644
--- a/drivers/video/tegra/host/pva/nvpva_syncpt.h
+++ b/drivers/video/tegra/host/pva/nvpva_syncpt.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * 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 <http://www.gnu.org/licenses/>.
+ * Copyright (c) 2022-2023, NVIDIA CORPORATION. All rights reserved.
  */
 
 #ifndef __NVPVA_SYNCPT_H__
diff --git a/drivers/video/tegra/host/pva/pva-vpu-perf.h b/drivers/video/tegra/host/pva/pva-vpu-perf.h
index b499cb56..8b3d6f4a 100644
--- a/drivers/video/tegra/host/pva/pva-vpu-perf.h
+++ b/drivers/video/tegra/host/pva/pva-vpu-perf.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2018 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) 2018-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #ifndef _PVA_VPU_PERF_H_
diff --git a/drivers/video/tegra/host/pva/pva.c b/drivers/video/tegra/host/pva/pva.c
index f11eb598..f0b5d820 100644
--- a/drivers/video/tegra/host/pva/pva.c
+++ b/drivers/video/tegra/host/pva/pva.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2016-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/>.
+ * Copyright (c) 2016-2023, NVIDIA CORPORATION.  All rights reserved.
  */
 
 #include "pva_mailbox.h"
diff --git a/drivers/video/tegra/host/pva/pva.h b/drivers/video/tegra/host/pva/pva.h
index 7e55c8c7..c5c9ea7a 100644
--- a/drivers/video/tegra/host/pva/pva.h
+++ b/drivers/video/tegra/host/pva/pva.h
@@ -1,21 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * drivers/video/tegra/host/pva/pva.h
+ * Copyright (c) 2016-2023, NVIDIA CORPORATION. All rights reserved.
  *
  * Tegra PVA header
- *
- * Copyright (c) 2016-2023, 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/>.
  */
 
 #ifndef __NVHOST_PVA_H__
diff --git a/drivers/video/tegra/host/pva/pva_abort.c b/drivers/video/tegra/host/pva/pva_abort.c
index a15e73b5..5dc3c145 100644
--- a/drivers/video/tegra/host/pva/pva_abort.c
+++ b/drivers/video/tegra/host/pva/pva_abort.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2019-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/>.
+ * Copyright (c) 2022-2023, NVIDIA CORPORATION.  All rights reserved.
  */
 
 #include <linux/nvhost.h>
diff --git a/drivers/video/tegra/host/pva/pva_bit_helpers.h b/drivers/video/tegra/host/pva/pva_bit_helpers.h
index fc93b211..a604f958 100644
--- a/drivers/video/tegra/host/pva/pva_bit_helpers.h
+++ b/drivers/video/tegra/host/pva/pva_bit_helpers.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2021-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 <http://www.gnu.org/licenses/>.
+ * Copyright (c) 2021-2023, NVIDIA CORPORATION. All rights reserved.
  */
 
 #ifndef PVA_BIT_HELPERS_H_
diff --git a/drivers/video/tegra/host/pva/pva_ccq_t19x.c b/drivers/video/tegra/host/pva/pva_ccq_t19x.c
index 998fb268..5fa16abc 100644
--- a/drivers/video/tegra/host/pva/pva_ccq_t19x.c
+++ b/drivers/video/tegra/host/pva/pva_ccq_t19x.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
+ * Copyright (c) 2017-2023, NVIDIA CORPORATION.  All rights reserved.
+ *
  * PVA Command Queue Interface handling
- *
- * Copyright (c) 2017-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 <http://www.gnu.org/licenses/>.
  */
 
 #include "pva-interface.h"
diff --git a/drivers/video/tegra/host/pva/pva_ccq_t19x.h b/drivers/video/tegra/host/pva/pva_ccq_t19x.h
index 61c5a78b..89783153 100644
--- a/drivers/video/tegra/host/pva/pva_ccq_t19x.h
+++ b/drivers/video/tegra/host/pva/pva_ccq_t19x.h
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
+ * Copyright (c) 2019-2023, NVIDIA CORPORATION. All rights reserved.
+ *
  * PVA Command Queue Interface handling
- *
- * Copyright (c) 2019-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/>.
  */
 
 #ifndef PVA_CCQ_T19X_H
diff --git a/drivers/video/tegra/host/pva/pva_ccq_t23x.c b/drivers/video/tegra/host/pva/pva_ccq_t23x.c
index 9122f9c0..01f9a611 100644
--- a/drivers/video/tegra/host/pva/pva_ccq_t23x.c
+++ b/drivers/video/tegra/host/pva/pva_ccq_t23x.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
+ * Copyright (c) 2017-2023, NVIDIA CORPORATION.  All rights reserved.
+ *
  * PVA Command Queue Interface handling
- *
- * Copyright (c) 2017-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 <http://www.gnu.org/licenses/>.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/video/tegra/host/pva/pva_ccq_t23x.h b/drivers/video/tegra/host/pva/pva_ccq_t23x.h
index 87c94fa7..b9404c6e 100644
--- a/drivers/video/tegra/host/pva/pva_ccq_t23x.h
+++ b/drivers/video/tegra/host/pva/pva_ccq_t23x.h
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
+ * Copyright (c) 2019-2023, NVIDIA CORPORATION. All rights reserved.
+ *
  * PVA Command Queue Interface handling
- *
- * Copyright (c) 2019-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/>.
  */
 
 #ifndef PVA_CCQ_T23X_H
diff --git a/drivers/video/tegra/host/pva/pva_debug.c b/drivers/video/tegra/host/pva/pva_debug.c
index 618b027d..172dee5d 100644
--- a/drivers/video/tegra/host/pva/pva_debug.c
+++ b/drivers/video/tegra/host/pva/pva_debug.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
+ * Copyright (c) 2017-2023, NVIDIA CORPORATION.  All rights reserved.
+ *
  * PVA Debug Information file
- *
- * Copyright (c) 2017-2023, 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/>.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/video/tegra/host/pva/pva_dma.c b/drivers/video/tegra/host/pva/pva_dma.c
index d648e0f2..f54b62f1 100644
--- a/drivers/video/tegra/host/pva/pva_dma.c
+++ b/drivers/video/tegra/host/pva/pva_dma.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2021-2023, 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/>.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/video/tegra/host/pva/pva_dma.h b/drivers/video/tegra/host/pva/pva_dma.h
index 1fe589b4..6df2021c 100644
--- a/drivers/video/tegra/host/pva/pva_dma.h
+++ b/drivers/video/tegra/host/pva/pva_dma.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 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) 2021-2023, NVIDIA CORPORATION. All rights reserved.
  */
 
 #ifndef PVA_DMA_H
diff --git a/drivers/video/tegra/host/pva/pva_fw_carveout.c b/drivers/video/tegra/host/pva/pva_fw_carveout.c
index 3949bd2e..5e58df48 100644
--- a/drivers/video/tegra/host/pva/pva_fw_carveout.c
+++ b/drivers/video/tegra/host/pva/pva_fw_carveout.c
@@ -1,20 +1,8 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
+// SPDX-License-Identifier: GPL-2.0-only
 /*
+ * Copyright (c) 2022-2023, NVIDIA CORPORATION. All rights reserved.
+ *
  * PVA carveout handling
- *
- * 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 <http://www.gnu.org/licenses/>.
  */
 
 #include <linux/module.h>
diff --git a/drivers/video/tegra/host/pva/pva_fw_carveout.h b/drivers/video/tegra/host/pva/pva_fw_carveout.h
index 860a7ccb..81915b93 100644
--- a/drivers/video/tegra/host/pva/pva_fw_carveout.h
+++ b/drivers/video/tegra/host/pva/pva_fw_carveout.h
@@ -1,20 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
+ * Copyright (c) 2022-2023, NVIDIA CORPORATION. All rights reserved.
+ *
  * PVA carveout handling
- *
- * 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 <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PVA_FW_CO_H
diff --git a/drivers/video/tegra/host/pva/pva_hwseq.h b/drivers/video/tegra/host/pva/pva_hwseq.h
index f8fc60df..4aba5e01 100644
--- a/drivers/video/tegra/host/pva/pva_hwseq.h
+++ b/drivers/video/tegra/host/pva/pva_hwseq.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * 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 <http://www.gnu.org/licenses/>.
+ * Copyright (c) 2022-2023, NVIDIA CORPORATION. All rights reserved.
  */
 
 #ifndef PVA_HWSEQ_H
diff --git a/drivers/video/tegra/host/pva/pva_interface_regs_t19x.c b/drivers/video/tegra/host/pva/pva_interface_regs_t19x.c
index 6ba68c4f..13861dc2 100644
--- a/drivers/video/tegra/host/pva/pva_interface_regs_t19x.c
+++ b/drivers/video/tegra/host/pva/pva_interface_regs_t19x.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2016-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 <http://www.gnu.org/licenses/>.
+ * Copyright (c) 2016-2023, NVIDIA CORPORATION. All rights reserved.
  */
 
 #include <linux/export.h>
diff --git a/drivers/video/tegra/host/pva/pva_interface_regs_t19x.h b/drivers/video/tegra/host/pva/pva_interface_regs_t19x.h
index 2d887697..bc402e6d 100644
--- a/drivers/video/tegra/host/pva/pva_interface_regs_t19x.h
+++ b/drivers/video/tegra/host/pva/pva_interface_regs_t19x.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016-2019, 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) 2016-2023, NVIDIA CORPORATION. All rights reserved.
  */
 
 #ifndef __PVA_INTERFACE_REGS_T19X_H__
diff --git a/drivers/video/tegra/host/pva/pva_interface_regs_t23x.c b/drivers/video/tegra/host/pva/pva_interface_regs_t23x.c
index af072343..227a5957 100644
--- a/drivers/video/tegra/host/pva/pva_interface_regs_t23x.c
+++ b/drivers/video/tegra/host/pva/pva_interface_regs_t23x.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2016-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 <http://www.gnu.org/licenses/>.
+ * Copyright (c) 2016-2023, NVIDIA CORPORATION. All rights reserved.
  */
 
 #include <linux/export.h>
diff --git a/drivers/video/tegra/host/pva/pva_interface_regs_t23x.h b/drivers/video/tegra/host/pva/pva_interface_regs_t23x.h
index 5ac6562f..c539c582 100644
--- a/drivers/video/tegra/host/pva/pva_interface_regs_t23x.h
+++ b/drivers/video/tegra/host/pva/pva_interface_regs_t23x.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016-2019, 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) 2016-2023, NVIDIA CORPORATION. All rights reserved.
  */
 
 #ifndef __PVA_INTERFACE_REGS_T23X_H__
diff --git a/drivers/video/tegra/host/pva/pva_ioctl.c b/drivers/video/tegra/host/pva/pva_ioctl.c
index 52e59e57..3869cba1 100644
--- a/drivers/video/tegra/host/pva/pva_ioctl.c
+++ b/drivers/video/tegra/host/pva/pva_ioctl.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2016-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) 2016-2023, NVIDIA CORPORATION. All rights reserved.
  */
 
 #include <linux/err.h>
diff --git a/drivers/video/tegra/host/pva/pva_iommu_context_dev.c b/drivers/video/tegra/host/pva/pva_iommu_context_dev.c
index 4dcf306f..99348d39 100644
--- a/drivers/video/tegra/host/pva/pva_iommu_context_dev.c
+++ b/drivers/video/tegra/host/pva/pva_iommu_context_dev.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
+ * Copyright (c) 2022-2023, NVIDIA CORPORATION. All rights reserved.
+ *
  * PVA Application Specific Virtual Memory
- *
- * Copyright (c) 2022-2023, 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/>.
  */
 
 #include <linux/dma-mapping.h>
diff --git a/drivers/video/tegra/host/pva/pva_iommu_context_dev.h b/drivers/video/tegra/host/pva/pva_iommu_context_dev.h
index fe4d95f2..ed8d03c8 100644
--- a/drivers/video/tegra/host/pva/pva_iommu_context_dev.h
+++ b/drivers/video/tegra/host/pva/pva_iommu_context_dev.h
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
+ * Copyright (c) 2022-2023, NVIDIA CORPORATION. All rights reserved.
+ *
  * Host1x Application Specific Virtual Memory
- *
- * 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 <http://www.gnu.org/licenses/>.
  */
 
 #ifndef IOMMU_CONTEXT_DEV_H
diff --git a/drivers/video/tegra/host/pva/pva_isr.c b/drivers/video/tegra/host/pva/pva_isr.c
index 40a89da0..c00a7df6 100644
--- a/drivers/video/tegra/host/pva/pva_isr.c
+++ b/drivers/video/tegra/host/pva/pva_isr.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
+ * Copyright (c) 2016-2023, NVIDIA CORPORATION. All rights reserved.
+ *
  * PVA ISR code
- *
- * Copyright (c) 2016-2023, 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/>.
  */
 
 #define PVA_MASK_LOW_16BITS 0xff
diff --git a/drivers/video/tegra/host/pva/pva_isr_t23x.c b/drivers/video/tegra/host/pva/pva_isr_t23x.c
index 688c46db..d681d559 100644
--- a/drivers/video/tegra/host/pva/pva_isr_t23x.c
+++ b/drivers/video/tegra/host/pva/pva_isr_t23x.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
+ * Copyright (c) 2019-2023, NVIDIA CORPORATION. All rights reserved.
+ *
  * PVA ISR code for T23X
- *
- * Copyright (c) 2019-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 <http://www.gnu.org/licenses/>.
  */
 
 #include "pva_isr_t23x.h"
diff --git a/drivers/video/tegra/host/pva/pva_isr_t23x.h b/drivers/video/tegra/host/pva/pva_isr_t23x.h
index 6c9a491a..bb5b5bc8 100644
--- a/drivers/video/tegra/host/pva/pva_isr_t23x.h
+++ b/drivers/video/tegra/host/pva/pva_isr_t23x.h
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
+ * Copyright (c) 2019-2023, NVIDIA CORPORATION. All rights reserved.
+ *
  * PVA ISR interface for T23X
- *
- * Copyright (c) 2019, 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/>.
  */
 #ifndef __NVHOST_PVA_ISR_T23X_H__
 #define __NVHOST_PVA_ISR_T23X_H__
@@ -22,4 +11,4 @@
 
 irqreturn_t pva_ccq_isr(int irq, void *dev_id);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/drivers/video/tegra/host/pva/pva_mailbox.c b/drivers/video/tegra/host/pva/pva_mailbox.c
index 41b89c65..f243909a 100644
--- a/drivers/video/tegra/host/pva/pva_mailbox.c
+++ b/drivers/video/tegra/host/pva/pva_mailbox.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
+ * Copyright (c) 2016-2023, NVIDIA CORPORATION. All rights reserved.
+ *
  * PVA mailbox code
- *
- * Copyright (c) 2016-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 <http://www.gnu.org/licenses/>.
  */
 
 #include <linux/export.h>
diff --git a/drivers/video/tegra/host/pva/pva_mailbox.h b/drivers/video/tegra/host/pva/pva_mailbox.h
index 577e0b1f..249df7e3 100644
--- a/drivers/video/tegra/host/pva/pva_mailbox.h
+++ b/drivers/video/tegra/host/pva/pva_mailbox.h
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
+ * Copyright (c) 2016-2023, NVIDIA CORPORATION. All rights reserved.
+ *
  * PVA mailbox header
- *
- * Copyright (c) 2016-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/>.
  */
 
 #ifndef __PVA_MAILBOX_H__
diff --git a/drivers/video/tegra/host/pva/pva_mailbox_t19x.c b/drivers/video/tegra/host/pva/pva_mailbox_t19x.c
index 415ec489..c2de7a9c 100644
--- a/drivers/video/tegra/host/pva/pva_mailbox_t19x.c
+++ b/drivers/video/tegra/host/pva/pva_mailbox_t19x.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
+ * Copyright (c) 2016-2023, NVIDIA CORPORATION. All rights reserved.
+ *
  * PVA mailbox code
- *
- * Copyright (c) 2016-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 <http://www.gnu.org/licenses/>.
  */
 
 #include <linux/export.h>
diff --git a/drivers/video/tegra/host/pva/pva_mailbox_t19x.h b/drivers/video/tegra/host/pva/pva_mailbox_t19x.h
index 62ce1d89..265b341f 100644
--- a/drivers/video/tegra/host/pva/pva_mailbox_t19x.h
+++ b/drivers/video/tegra/host/pva/pva_mailbox_t19x.h
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
+ * Copyright (c) 2016-2023, NVIDIA CORPORATION. All rights reserved.
+ *
  * PVA mailbox header
- *
- * Copyright (c) 2016-2019, 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/>.
  */
 
 #ifndef __PVA_MAILBOX_T19X_H__
diff --git a/drivers/video/tegra/host/pva/pva_mailbox_t23x.c b/drivers/video/tegra/host/pva/pva_mailbox_t23x.c
index 8e3b94d9..d462ab67 100644
--- a/drivers/video/tegra/host/pva/pva_mailbox_t23x.c
+++ b/drivers/video/tegra/host/pva/pva_mailbox_t23x.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
+ * Copyright (c) 2016-2023, NVIDIA CORPORATION. All rights reserved.
+ *
  * PVA mailbox code for T23x
- *
- * Copyright (c) 2016-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 <http://www.gnu.org/licenses/>.
  */
 
 #include <linux/export.h>
diff --git a/drivers/video/tegra/host/pva/pva_mailbox_t23x.h b/drivers/video/tegra/host/pva/pva_mailbox_t23x.h
index 536e23fc..da07627a 100644
--- a/drivers/video/tegra/host/pva/pva_mailbox_t23x.h
+++ b/drivers/video/tegra/host/pva/pva_mailbox_t23x.h
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
+ * Copyright (c) 2016-2023, NVIDIA CORPORATION. All rights reserved.
+ *
  * PVA mailbox header
- *
- * Copyright (c) 2016-2019, 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/>.
  */
 
 #ifndef __PVA_MAILBOX_T23X_H__
diff --git a/drivers/video/tegra/host/pva/pva_nvhost.h b/drivers/video/tegra/host/pva/pva_nvhost.h
index 9abed27c..5e20fbe3 100644
--- a/drivers/video/tegra/host/pva/pva_nvhost.h
+++ b/drivers/video/tegra/host/pva/pva_nvhost.h
@@ -1,16 +1,6 @@
-/* Copyright (c) 2021-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 <http://www.gnu.org/licenses/>.
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2021-2023, NVIDIA CORPORATION. All rights reserved.
  */
 
 #ifndef PVA_NVHOST_H
diff --git a/drivers/video/tegra/host/pva/pva_queue.c b/drivers/video/tegra/host/pva/pva_queue.c
index c923a403..68470a9c 100644
--- a/drivers/video/tegra/host/pva/pva_queue.c
+++ b/drivers/video/tegra/host/pva/pva_queue.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2020-2023, 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/>.
  */
 
 #include <asm-generic/errno-base.h>
diff --git a/drivers/video/tegra/host/pva/pva_queue.h b/drivers/video/tegra/host/pva/pva_queue.h
index 8130072a..83230e03 100644
--- a/drivers/video/tegra/host/pva/pva_queue.h
+++ b/drivers/video/tegra/host/pva/pva_queue.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2016-2023, 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/>.
  */
 
 #ifndef PVA_QUEUE_H
diff --git a/drivers/video/tegra/host/pva/pva_regs.h b/drivers/video/tegra/host/pva/pva_regs.h
index 4a3e1659..65f65a5f 100644
--- a/drivers/video/tegra/host/pva/pva_regs.h
+++ b/drivers/video/tegra/host/pva/pva_regs.h
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- *
- * Copyright (c) 2016-2023 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) 2016-2023, NVIDIA CORPORATION. All rights reserved.
  */
+
 #ifndef _PVA_REGS_H_
 #define _PVA_REGS_H_
 
diff --git a/drivers/video/tegra/host/pva/pva_sec_ec.c b/drivers/video/tegra/host/pva/pva_sec_ec.c
index b32163b9..164383b2 100644
--- a/drivers/video/tegra/host/pva/pva_sec_ec.c
+++ b/drivers/video/tegra/host/pva/pva_sec_ec.c
@@ -1,18 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2023, 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/>.
  */
 
 #include <linux/nvhost.h>
diff --git a/drivers/video/tegra/host/pva/pva_sec_ec.h b/drivers/video/tegra/host/pva/pva_sec_ec.h
index c779d97f..81cc847e 100644
--- a/drivers/video/tegra/host/pva/pva_sec_ec.h
+++ b/drivers/video/tegra/host/pva/pva_sec_ec.h
@@ -1,18 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2023, 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/>.
  */
 
 #ifndef _PVA_SEC_EC_H_
diff --git a/drivers/video/tegra/host/pva/pva_sha256.c b/drivers/video/tegra/host/pva/pva_sha256.c
index 35bb5900..45bf9230 100644
--- a/drivers/video/tegra/host/pva/pva_sha256.c
+++ b/drivers/video/tegra/host/pva/pva_sha256.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2021-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) 2021-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/video/tegra/host/pva/pva_sha256.h b/drivers/video/tegra/host/pva/pva_sha256.h
index 62b9880d..725c6984 100644
--- a/drivers/video/tegra/host/pva/pva_sha256.h
+++ b/drivers/video/tegra/host/pva/pva_sha256.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2021-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) 2021-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #ifndef PVA_SHA256_H
diff --git a/drivers/video/tegra/host/pva/pva_status_regs.h b/drivers/video/tegra/host/pva/pva_status_regs.h
index 6d7da9dc..95607fc0 100644
--- a/drivers/video/tegra/host/pva/pva_status_regs.h
+++ b/drivers/video/tegra/host/pva/pva_status_regs.h
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
+ * Copyright (c) 2016-2023, NVIDIA Corporation.  All rights reserved.
+ *
  * PVA Command header
- *
- * Copyright (c) 2016-2019, 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/>.
  */
 
 
diff --git a/drivers/video/tegra/host/pva/pva_system_allow_list.c b/drivers/video/tegra/host/pva/pva_system_allow_list.c
index 28451b0c..64113dcf 100644
--- a/drivers/video/tegra/host/pva/pva_system_allow_list.c
+++ b/drivers/video/tegra/host/pva/pva_system_allow_list.c
@@ -1,14 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 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.
+ * Copyright (c) 2022-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 unsigned char pva_auth_allow_list_sys[] = {
diff --git a/drivers/video/tegra/host/pva/pva_system_allow_list.h b/drivers/video/tegra/host/pva/pva_system_allow_list.h
index b9c21bc2..62ef51ff 100644
--- a/drivers/video/tegra/host/pva/pva_system_allow_list.h
+++ b/drivers/video/tegra/host/pva/pva_system_allow_list.h
@@ -1,14 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 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.
+ * Copyright (c) 2022-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #ifndef PVA_ALLOW_LIST_SYS_H
diff --git a/drivers/video/tegra/host/pva/pva_trace.c b/drivers/video/tegra/host/pva/pva_trace.c
index eaca3220..907a8656 100644
--- a/drivers/video/tegra/host/pva/pva_trace.c
+++ b/drivers/video/tegra/host/pva/pva_trace.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
+ * Copyright (c) 2017-2023, NVIDIA Corporation.  All rights reserved.
+ *
  * PVA trace log
- *
- * Copyright (c) 2017-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 <http://www.gnu.org/licenses/>.
  */
 
 #define CREATE_TRACE_POINTS
diff --git a/drivers/video/tegra/host/pva/pva_trace.h b/drivers/video/tegra/host/pva/pva_trace.h
index 2965263f..fcbefe3d 100644
--- a/drivers/video/tegra/host/pva/pva_trace.h
+++ b/drivers/video/tegra/host/pva/pva_trace.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2017 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) 2017-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #ifndef _PVA_TRACE_H_
diff --git a/drivers/video/tegra/host/pva/pva_version_config_t19x.c b/drivers/video/tegra/host/pva/pva_version_config_t19x.c
index 101288e1..2de1d6ff 100644
--- a/drivers/video/tegra/host/pva/pva_version_config_t19x.c
+++ b/drivers/video/tegra/host/pva/pva_version_config_t19x.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2016-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) 2016-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #include "pva_mailbox_t19x.h"
diff --git a/drivers/video/tegra/host/pva/pva_version_config_t19x.h b/drivers/video/tegra/host/pva/pva_version_config_t19x.h
index 0d85b882..48a8deb3 100644
--- a/drivers/video/tegra/host/pva/pva_version_config_t19x.h
+++ b/drivers/video/tegra/host/pva/pva_version_config_t19x.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016-2019, 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) 2016-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #ifndef __PVA_VERSION_CONFIG_T19x_H__
diff --git a/drivers/video/tegra/host/pva/pva_version_config_t23x.c b/drivers/video/tegra/host/pva/pva_version_config_t23x.c
index 825d7794..2a58a672 100644
--- a/drivers/video/tegra/host/pva/pva_version_config_t23x.c
+++ b/drivers/video/tegra/host/pva/pva_version_config_t23x.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2016-2019, 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) 2016-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #include "pva_mailbox_t23x.h"
diff --git a/drivers/video/tegra/host/pva/pva_version_config_t23x.h b/drivers/video/tegra/host/pva/pva_version_config_t23x.h
index dada8520..6ec7f8a5 100644
--- a/drivers/video/tegra/host/pva/pva_version_config_t23x.h
+++ b/drivers/video/tegra/host/pva/pva_version_config_t23x.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016-2019, 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) 2016-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #ifndef __PVA_VERSION_CONFIG_T23X_H__
diff --git a/drivers/video/tegra/host/pva/pva_vpu_app_auth.c b/drivers/video/tegra/host/pva/pva_vpu_app_auth.c
index 9c60e2e3..37420d3e 100644
--- a/drivers/video/tegra/host/pva/pva_vpu_app_auth.c
+++ b/drivers/video/tegra/host/pva/pva_vpu_app_auth.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2021-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) 2021-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/video/tegra/host/pva/pva_vpu_app_auth.h b/drivers/video/tegra/host/pva/pva_vpu_app_auth.h
index e2804a49..c686f30e 100644
--- a/drivers/video/tegra/host/pva/pva_vpu_app_auth.h
+++ b/drivers/video/tegra/host/pva/pva_vpu_app_auth.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2021-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) 2021-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #ifndef NVPVA_VPU_HASH_H
diff --git a/drivers/video/tegra/host/pva/pva_vpu_exe.c b/drivers/video/tegra/host/pva/pva_vpu_exe.c
index e3ec28f3..ea2f65c0 100644
--- a/drivers/video/tegra/host/pva/pva_vpu_exe.c
+++ b/drivers/video/tegra/host/pva/pva_vpu_exe.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2021-2023, 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) 2021-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #include <linux/dma-mapping.h>
diff --git a/drivers/video/tegra/host/pva/pva_vpu_exe.h b/drivers/video/tegra/host/pva/pva_vpu_exe.h
index 2ef06734..78ccf6f9 100644
--- a/drivers/video/tegra/host/pva/pva_vpu_exe.h
+++ b/drivers/video/tegra/host/pva/pva_vpu_exe.h
@@ -1,20 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2021-2023, 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) 2021-2023, NVIDIA Corporation.  All rights reserved.
  */
 
-
 #ifndef NVPVA_VPU_APP_H
 #define NVPVA_VPU_APP_H
 #include <uapi/linux/nvpva_ioctl.h>
diff --git a/drivers/video/tegra/host/pva/pva_vpu_ocd.c b/drivers/video/tegra/host/pva/pva_vpu_ocd.c
index 7eeb7e32..f130e925 100644
--- a/drivers/video/tegra/host/pva/pva_vpu_ocd.c
+++ b/drivers/video/tegra/host/pva/pva_vpu_ocd.c
@@ -1,18 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
- * 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 <http://www.gnu.org/licenses/>.
+ * Copyright (c) 2022-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #include <linux/types.h>
diff --git a/drivers/video/tegra/host/pva/pva_vpu_ocd.h b/drivers/video/tegra/host/pva/pva_vpu_ocd.h
index 99d18ab4..29b82836 100644
--- a/drivers/video/tegra/host/pva/pva_vpu_ocd.h
+++ b/drivers/video/tegra/host/pva/pva_vpu_ocd.h
@@ -1,18 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * 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 <http://www.gnu.org/licenses/>.
+ * Copyright (c) 2022-2023, NVIDIA Corporation.  All rights reserved.
  */
 
 #ifndef PVA_VPU_OCD_H
diff --git a/include/trace/events/nvhost_pva.h b/include/trace/events/nvhost_pva.h
index b889b88c..2eeb0173 100644
--- a/include/trace/events/nvhost_pva.h
+++ b/include/trace/events/nvhost_pva.h
@@ -1,21 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
+ * Copyright (c) 2017-2023, NVIDIA Corporation.  All rights reserved.
+ *
  * Nvhost event logging to ftrace.
- *
- * Copyright (c) 2017-2022, 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, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 #undef TRACE_SYSTEM
diff --git a/include/uapi/linux/nvpva_ioctl.h b/include/uapi/linux/nvpva_ioctl.h
index 6e53abee..180120a9 100644
--- a/include/uapi/linux/nvpva_ioctl.h
+++ b/include/uapi/linux/nvpva_ioctl.h
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
+ * Copyright (c) 2021-2023, NVIDIA Corporation.  All rights reserved.
+ *
  * Tegra PVA Driver ioctls
- *
- * Copyright (c) 2021-2023, 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/>.
  */
 
 #ifndef __NVPVA_IOCTL_H__