diff --git a/drivers/tegra/hwpm/include/tegra_hwpm_aperture.h b/drivers/tegra/hwpm/include/tegra_hwpm_aperture.h
index 1a9f522..9857af8 100644
--- a/drivers/tegra/hwpm/include/tegra_hwpm_aperture.h
+++ b/drivers/tegra/hwpm/include/tegra_hwpm_aperture.h
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: MIT */
 /*
  * SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
- * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/drivers/tegra/hwpm/include/tegra_hwpm_common.h b/drivers/tegra/hwpm/include/tegra_hwpm_common.h
index c6d6d0a..8af0874 100644
--- a/drivers/tegra/hwpm/include/tegra_hwpm_common.h
+++ b/drivers/tegra/hwpm/include/tegra_hwpm_common.h
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: MIT */
 /*
  * SPDX-FileCopyrightText: Copyright (c) 2021-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
- * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/drivers/tegra/hwpm/os/linux/aperture_utils.c b/drivers/tegra/hwpm/os/linux/aperture_utils.c
index 43da77f..a432439 100644
--- a/drivers/tegra/hwpm/os/linux/aperture_utils.c
+++ b/drivers/tegra/hwpm/os/linux/aperture_utils.c
@@ -1,6 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
- * SPDX-License-Identifier: GPL-2.0-only
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
diff --git a/drivers/tegra/hwpm/os/linux/aperture_utils.h b/drivers/tegra/hwpm/os/linux/aperture_utils.h
index 7fb9f8c..f2ebb55 100644
--- a/drivers/tegra/hwpm/os/linux/aperture_utils.h
+++ b/drivers/tegra/hwpm/os/linux/aperture_utils.h
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
- * SPDX-License-Identifier: GPL-2.0-only
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
diff --git a/drivers/tegra/hwpm/os/linux/regops_utils.c b/drivers/tegra/hwpm/os/linux/regops_utils.c
index 3a3cb88..2d2550f 100644
--- a/drivers/tegra/hwpm/os/linux/regops_utils.c
+++ b/drivers/tegra/hwpm/os/linux/regops_utils.c
@@ -1,6 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * SPDX-FileCopyrightText: Copyright (c) 2021-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
- * SPDX-License-Identifier: GPL-2.0-only
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,