diff --git a/asoc/kona.c b/asoc/kona.c
index bcc17736475f..1c68a986c02f 100644
--- a/asoc/kona.c
+++ b/asoc/kona.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/adsp-loader.c b/dsp/adsp-loader.c
index 725e3703c819..387850bd3670 100644
--- a/dsp/adsp-loader.c
+++ b/dsp/adsp-loader.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2012-2014, 2017-2018, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/adsp_err.c b/dsp/adsp_err.c
index 1b30b2b40ae0..f2401569ccbe 100644
--- a/dsp/adsp_err.c
+++ b/dsp/adsp_err.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/adsp_err.h b/dsp/adsp_err.h
index 9b3c4c449e8a..8a0f6bf97748 100644
--- a/dsp/adsp_err.h
+++ b/dsp/adsp_err.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/audio_cal_utils.c b/dsp/audio_cal_utils.c
index 36068d3b949b..19c71fc55208 100644
--- a/dsp/audio_cal_utils.c
+++ b/dsp/audio_cal_utils.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/audio_calibration.c b/dsp/audio_calibration.c
index 93bd352ad9b1..a5167be3cfaa 100644
--- a/dsp/audio_calibration.c
+++ b/dsp/audio_calibration.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2014, 2016-2017, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/audio_notifier.c b/dsp/audio_notifier.c
index cb23c4c523e0..56cfa31fa645 100644
--- a/dsp/audio_notifier.c
+++ b/dsp/audio_notifier.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/audio_pdr.c b/dsp/audio_pdr.c
index 509d5c81a77c..b9341dec1e52 100644
--- a/dsp/audio_pdr.c
+++ b/dsp/audio_pdr.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/audio_pdr.h b/dsp/audio_pdr.h
index 398d6871ce48..e563275ee5e3 100644
--- a/dsp/audio_pdr.h
+++ b/dsp/audio_pdr.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/audio_slimslave.c b/dsp/audio_slimslave.c
index 69cdf59db929..b09506a05f18 100644
--- a/dsp/audio_slimslave.c
+++ b/dsp/audio_slimslave.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2013-2014, 2017-2018, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/audio_ssr.c b/dsp/audio_ssr.c
index 8c27097085e4..9a9467ae73a2 100644
--- a/dsp/audio_ssr.c
+++ b/dsp/audio_ssr.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2016, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/audio_ssr.h b/dsp/audio_ssr.h
index d633ffd9cac2..e79c59433d78 100644
--- a/dsp/audio_ssr.h
+++ b/dsp/audio_ssr.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2016, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/avtimer.c b/dsp/avtimer.c
index ee73826cb329..29bfd24adc2b 100644
--- a/dsp/avtimer.c
+++ b/dsp/avtimer.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2012-2015, 2017-2018 The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/msm-audio-event-notify.c b/dsp/msm-audio-event-notify.c
index da3188c3656e..06b4d3eaa732 100644
--- a/dsp/msm-audio-event-notify.c
+++ b/dsp/msm-audio-event-notify.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2018, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/msm-dts-srs-tm-config.c b/dsp/msm-dts-srs-tm-config.c
index 81bb7941bd97..b507d02af7d9 100644
--- a/dsp/msm-dts-srs-tm-config.c
+++ b/dsp/msm-dts-srs-tm-config.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2012-2014, 2016-2018, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/msm_audio_ion.c b/dsp/msm_audio_ion.c
index eeea32d87be3..089376cb28e7 100644
--- a/dsp/msm_audio_ion.c
+++ b/dsp/msm_audio_ion.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/msm_mdf.c b/dsp/msm_mdf.c
index 674dd748aafe..e3d87e32f381 100644
--- a/dsp/msm_mdf.c
+++ b/dsp/msm_mdf.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2018, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/q6_init.c b/dsp/q6_init.c
index bd8a2f86da4a..e97a49692c7d 100644
--- a/dsp/q6_init.c
+++ b/dsp/q6_init.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017, The Linux Foundation. All rights reserved.
 */
diff --git a/dsp/q6_init.h b/dsp/q6_init.h
index 21be5241ac68..bd4ba399a34e 100644
--- a/dsp/q6_init.h
+++ b/dsp/q6_init.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
 */
diff --git a/dsp/q6adm.c b/dsp/q6adm.c
index 1851b9877357..688012f727d9 100644
--- a/dsp/q6adm.c
+++ b/dsp/q6adm.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/q6afe.c b/dsp/q6afe.c
index 7f82e7c05a27..1b5c94d59a5f 100644
--- a/dsp/q6afe.c
+++ b/dsp/q6afe.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/q6afecal-hwdep.c b/dsp/q6afecal-hwdep.c
index c399fa6d93d8..0a040749d5a4 100644
--- a/dsp/q6afecal-hwdep.c
+++ b/dsp/q6afecal-hwdep.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2015, 2017, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/q6afecal-hwdep.h b/dsp/q6afecal-hwdep.h
index d48b80f82aa9..68c48b71088a 100644
--- a/dsp/q6afecal-hwdep.h
+++ b/dsp/q6afecal-hwdep.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2014, 2018, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/q6asm.c b/dsp/q6asm.c
index 1b10d62b4af8..300bdf2b4dd1 100644
--- a/dsp/q6asm.c
+++ b/dsp/q6asm.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/q6audio-v2.c b/dsp/q6audio-v2.c
index f0b031cf0166..822fbb53b18b 100644
--- a/dsp/q6audio-v2.c
+++ b/dsp/q6audio-v2.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/q6common.c b/dsp/q6common.c
index 0c5427de2d90..8270054e8ec3 100644
--- a/dsp/q6common.c
+++ b/dsp/q6common.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/q6core.c b/dsp/q6core.c
index 38551439637f..283f785f66f8 100644
--- a/dsp/q6core.c
+++ b/dsp/q6core.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/q6lsm.c b/dsp/q6lsm.c
index 7e40ec44fba1..6af7f6953507 100644
--- a/dsp/q6lsm.c
+++ b/dsp/q6lsm.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2013-2019, Linux Foundation. All rights reserved.
  */
diff --git a/dsp/q6usm.c b/dsp/q6usm.c
index 70ebc9fe5b2d..ce25c71e137f 100644
--- a/dsp/q6usm.c
+++ b/dsp/q6usm.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/q6usm.h b/dsp/q6usm.h
index 975b89606043..aa531b028495 100644
--- a/dsp/q6usm.h
+++ b/dsp/q6usm.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2011-2014, 2018, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/q6voice.c b/dsp/q6voice.c
index 95a153d4fa25..17746b1962fd 100644
--- a/dsp/q6voice.c
+++ b/dsp/q6voice.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/rtac.c b/dsp/rtac.c
index 6e606d17edb4..37b7e49f9599 100644
--- a/dsp/rtac.c
+++ b/dsp/rtac.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/usf.c b/dsp/usf.c
index c6850e5a52de..e408c7d70f5b 100644
--- a/dsp/usf.c
+++ b/dsp/usf.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/usf.h b/dsp/usf.h
index 5aeec06e2dac..b7e516d5920d 100644
--- a/dsp/usf.h
+++ b/dsp/usf.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2011-2014, The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/usfcdev.c b/dsp/usfcdev.c
index cab76612916c..d1ac4c0025b2 100644
--- a/dsp/usfcdev.c
+++ b/dsp/usfcdev.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2012-2013, 2016-2017 The Linux Foundation. All rights reserved.
  */
diff --git a/dsp/usfcdev.h b/dsp/usfcdev.h
index dcde63b05d08..7b8bce7b3721 100644
--- a/dsp/usfcdev.h
+++ b/dsp/usfcdev.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2012, The Linux Foundation. All rights reserved.
  */