diff --git a/amlogic_utils.sh b/amlogic_utils.sh
index c4a87a6ad..361fb090a 100644
--- a/amlogic_utils.sh
+++ b/amlogic_utils.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+#
+# Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+#
 
 function real_path() {
 	export PATH=${ROOT_DIR}/build/kernel/build-tools/path/linux-x86:$PATH
diff --git a/auto_patch/auto_patch.sh b/auto_patch/auto_patch.sh
index 09f489b27..294b0e3fb 100755
--- a/auto_patch/auto_patch.sh
+++ b/auto_patch/auto_patch.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+#
+# Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+#
 
 function get_paths_and_enter_common_path()
 {
diff --git a/drivers/amfc/aml_erofs/decompressor_deflate.c b/drivers/amfc/aml_erofs/decompressor_deflate.c
index 5070d2fcc..cf4f4fb31 100644
--- a/drivers/amfc/aml_erofs/decompressor_deflate.c
+++ b/drivers/amfc/aml_erofs/decompressor_deflate.c
@@ -1,4 +1,8 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #include <linux/zlib.h>
 #include "compress.h"
 
diff --git a/drivers/amfc/aml_erofs/decompressor_lzma.c b/drivers/amfc/aml_erofs/decompressor_lzma.c
index 406668150..16c6317f0 100644
--- a/drivers/amfc/aml_erofs/decompressor_lzma.c
+++ b/drivers/amfc/aml_erofs/decompressor_lzma.c
@@ -1,4 +1,8 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #include <linux/xz.h>
 #include "compress.h"
 
diff --git a/drivers/amfc/aml_erofs/decompressor_zstd.c b/drivers/amfc/aml_erofs/decompressor_zstd.c
index 7e1773049..f008ac7b1 100644
--- a/drivers/amfc/aml_erofs/decompressor_zstd.c
+++ b/drivers/amfc/aml_erofs/decompressor_zstd.c
@@ -1,4 +1,8 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #include <linux/zstd.h>
 #include "compress.h"
 
diff --git a/drivers/amfc/aml_zram/backend_amfc.c b/drivers/amfc/aml_zram/backend_amfc.c
index 7446fbb39..2a293278b 100644
--- a/drivers/amfc/aml_zram/backend_amfc.c
+++ b/drivers/amfc/aml_zram/backend_amfc.c
@@ -1,3 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
diff --git a/drivers/amfc/aml_zram/backend_amfc.h b/drivers/amfc/aml_zram/backend_amfc.h
index db0ec3d2c..31d614344 100644
--- a/drivers/amfc/aml_zram/backend_amfc.h
+++ b/drivers/amfc/aml_zram/backend_amfc.h
@@ -1,4 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef __BACKEND_AMFC_H__
 #define __BACKEND_AMFC_H__
diff --git a/drivers/amfc/aml_zram/backend_lz4.c b/drivers/amfc/aml_zram/backend_lz4.c
index 847f3334e..f3726f8c0 100644
--- a/drivers/amfc/aml_zram/backend_lz4.c
+++ b/drivers/amfc/aml_zram/backend_lz4.c
@@ -1,3 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #include <linux/kernel.h>
 #include <linux/lz4.h>
 #include <linux/slab.h>
diff --git a/drivers/amfc/aml_zram/backend_lz4.h b/drivers/amfc/aml_zram/backend_lz4.h
index c11fa602a..c1893ebb7 100644
--- a/drivers/amfc/aml_zram/backend_lz4.h
+++ b/drivers/amfc/aml_zram/backend_lz4.h
@@ -1,4 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef __BACKEND_LZ4_H__
 #define __BACKEND_LZ4_H__
diff --git a/drivers/amfc/aml_zram/backend_lzo.c b/drivers/amfc/aml_zram/backend_lzo.c
index 4c906beaa..03862e23c 100644
--- a/drivers/amfc/aml_zram/backend_lzo.c
+++ b/drivers/amfc/aml_zram/backend_lzo.c
@@ -1,4 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #include <linux/kernel.h>
 #include <linux/slab.h>
diff --git a/drivers/amfc/aml_zram/backend_lzo.h b/drivers/amfc/aml_zram/backend_lzo.h
index 93d54749e..9744d32e1 100644
--- a/drivers/amfc/aml_zram/backend_lzo.h
+++ b/drivers/amfc/aml_zram/backend_lzo.h
@@ -1,4 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef __BACKEND_LZO_H__
 #define __BACKEND_LZO_H__
diff --git a/drivers/amfc/aml_zram/backend_lzorle.c b/drivers/amfc/aml_zram/backend_lzorle.c
index 10640c96c..d67f640ce 100644
--- a/drivers/amfc/aml_zram/backend_lzorle.c
+++ b/drivers/amfc/aml_zram/backend_lzorle.c
@@ -1,4 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #include <linux/kernel.h>
 #include <linux/slab.h>
diff --git a/drivers/amfc/aml_zram/backend_lzorle.h b/drivers/amfc/aml_zram/backend_lzorle.h
index 6ecb163b0..fc5cc8d40 100644
--- a/drivers/amfc/aml_zram/backend_lzorle.h
+++ b/drivers/amfc/aml_zram/backend_lzorle.h
@@ -1,4 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef __BACKEND_LZORLE_H__
 #define __BACKEND_LZORLE_H__
diff --git a/drivers/amfc/aml_zram/zcomp.c b/drivers/amfc/aml_zram/zcomp.c
index 8186512f2..b2a48fa5a 100644
--- a/drivers/amfc/aml_zram/zcomp.c
+++ b/drivers/amfc/aml_zram/zcomp.c
@@ -1,4 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/amfc/aml_zram/zcomp.h b/drivers/amfc/aml_zram/zcomp.h
index ad5762813..53fada042 100644
--- a/drivers/amfc/aml_zram/zcomp.h
+++ b/drivers/amfc/aml_zram/zcomp.h
@@ -1,4 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef _ZCOMP_H_
 #define _ZCOMP_H_
diff --git a/drivers/amfc/sym_helper/symbols.c b/drivers/amfc/sym_helper/symbols.c
index 8f4af73e4..1c415aded 100644
--- a/drivers/amfc/sym_helper/symbols.c
+++ b/drivers/amfc/sym_helper/symbols.c
@@ -1,8 +1,8 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * fs/f2fs/symbols.c
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
+
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/fs.h>
diff --git a/drivers/aml_tee/optee/log.h b/drivers/aml_tee/optee/log.h
index e0c27542c..5816daa36 100644
--- a/drivers/aml_tee/optee/log.h
+++ b/drivers/aml_tee/optee/log.h
@@ -1,4 +1,8 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #ifndef _OPTEE_LOG_H_
 #define _OPTEE_LOG_H_
 
diff --git a/drivers/clk/meson/c1.c b/drivers/clk/meson/c1.c
index d5ed35852..fcf65b830 100644
--- a/drivers/clk/meson/c1.c
+++ b/drivers/clk/meson/c1.c
@@ -1,8 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Amlogic Meson-C1 Clock Controller Driver
- *
- * Copyright (c) 2018 Amlogic, inc.
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/clk-provider.h>
diff --git a/drivers/clk/meson/s1a.c b/drivers/clk/meson/s1a.c
index b006a807c..20f3b8541 100644
--- a/drivers/clk/meson/s1a.c
+++ b/drivers/clk/meson/s1a.c
@@ -1,8 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Amlogic Meson-S1A Clock Controller Driver
- *
- * Copyright (c) 2018 Amlogic, inc.
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/clk-provider.h>
diff --git a/drivers/clk/meson/s1a.h b/drivers/clk/meson/s1a.h
index 1fccf4952..478fbd696 100644
--- a/drivers/clk/meson/s1a.h
+++ b/drivers/clk/meson/s1a.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (c) 2018 Amlogic, inc.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef __S1A_H
diff --git a/drivers/clk/meson/s4.c b/drivers/clk/meson/s4.c
index 61c81da3f..9a7c4d5d0 100644
--- a/drivers/clk/meson/s4.c
+++ b/drivers/clk/meson/s4.c
@@ -1,8 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Amlogic Meson-S4 Clock Controller Driver
- *
- * Copyright (c) 2018 Amlogic, inc.
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/clk-provider.h>
diff --git a/drivers/clk/meson/s4.h b/drivers/clk/meson/s4.h
index 2aacc1c22..32cc0070a 100644
--- a/drivers/clk/meson/s4.h
+++ b/drivers/clk/meson/s4.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (c) 2018 Amlogic, inc.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef __S4_H
diff --git a/drivers/drm/meson_eDP.h b/drivers/drm/meson_eDP.h
index 3d2a4f363..e0a462bb4 100644
--- a/drivers/drm/meson_eDP.h
+++ b/drivers/drm/meson_eDP.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
-/*__MESON_eDP_H
+/*
  * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
diff --git a/drivers/dvb_usbci/usb_ci.h b/drivers/dvb_usbci/usb_ci.h
index fe976e52e..b62551a7e 100644
--- a/drivers/dvb_usbci/usb_ci.h
+++ b/drivers/dvb_usbci/usb_ci.h
@@ -1,9 +1,8 @@
 /* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- * File    : aml_usbcam.h
- * Purpose : USB CAM driver
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
+
 #ifndef _AML_USBCAM_H
 #define _AML_USBCAM_H
 
diff --git a/drivers/dvb_usbci/usbci.c b/drivers/dvb_usbci/usbci.c
index 554800a24..785fca2b0 100644
--- a/drivers/dvb_usbci/usbci.c
+++ b/drivers/dvb_usbci/usbci.c
@@ -1,14 +1,8 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * File    : amlogic-usb-cam.c
- * Purpose : USB CAM driver
- *
- * Based on USB driver
- *
- *
- *
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
+
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/init.h>
diff --git a/drivers/dvb_usbci/usbci.h b/drivers/dvb_usbci/usbci.h
index 891cddce1..86292338e 100644
--- a/drivers/dvb_usbci/usbci.h
+++ b/drivers/dvb_usbci/usbci.h
@@ -1,9 +1,8 @@
 /* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- * File    : amlogic-usb-cam.h
- * Purpose : USB CAM driver
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
+
 #ifndef _AMLOGIC_USBCAM_H
 #define _AMLOGIC_USBCAM_H
 
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index b9ac49e8d..eadc85a89 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1,4 +1,8 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/gpio.h>
diff --git a/drivers/led/fd650.c b/drivers/led/fd650.c
index 465b13dcb..1382e1c60 100644
--- a/drivers/led/fd650.c
+++ b/drivers/led/fd650.c
@@ -1,4 +1,7 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/drivers/media/enhancement/amvecm/cm2_adj.c b/drivers/media/enhancement/amvecm/cm2_adj.c
index ae5585bcd..83ae04d5a 100644
--- a/drivers/media/enhancement/amvecm/cm2_adj.c
+++ b/drivers/media/enhancement/amvecm/cm2_adj.c
@@ -1,12 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * cm2_adj for pq module
- *
- * Copyright (c) 2017 powerqin <yong.qin@amlogic.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the smems of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef CONFIG_AMLOGIC_ZAPPER_CUT
diff --git a/drivers/media/video_processor/videotunnel/uapi/videotunnel.h b/drivers/media/video_processor/videotunnel/uapi/videotunnel.h
index b47c4a94b..b9470b649 100644
--- a/drivers/media/video_processor/videotunnel/uapi/videotunnel.h
+++ b/drivers/media/video_processor/videotunnel/uapi/videotunnel.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- * Copyright © 2020-2022 Amlogic Inc.
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef __UAPI_VIDEO_TUNNEL_H
diff --git a/drivers/media/vout/DisplayPort/CLK/dptx_clk_ctrl.h b/drivers/media/vout/DisplayPort/CLK/dptx_clk_ctrl.h
index d1ce2832b..3fad08583 100644
--- a/drivers/media/vout/DisplayPort/CLK/dptx_clk_ctrl.h
+++ b/drivers/media/vout/DisplayPort/CLK/dptx_clk_ctrl.h
@@ -1,8 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef _DPTX_CLK_CTRL_H
diff --git a/drivers/media/vout/DisplayPort/CLK/dptx_clk_if.c b/drivers/media/vout/DisplayPort/CLK/dptx_clk_if.c
index 2fc2b6f71..bc636389f 100644
--- a/drivers/media/vout/DisplayPort/CLK/dptx_clk_if.c
+++ b/drivers/media/vout/DisplayPort/CLK/dptx_clk_if.c
@@ -1,8 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/DisplayPort/CLK/dptx_clk_utils.c b/drivers/media/vout/DisplayPort/CLK/dptx_clk_utils.c
index 18f8d5165..ef8cc7e76 100644
--- a/drivers/media/vout/DisplayPort/CLK/dptx_clk_utils.c
+++ b/drivers/media/vout/DisplayPort/CLK/dptx_clk_utils.c
@@ -1,8 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/DisplayPort/DPTX_IP/dptx_IP_REG_T7.h b/drivers/media/vout/DisplayPort/DPTX_IP/dptx_IP_REG_T7.h
index c75cb36c8..2297c8ff3 100644
--- a/drivers/media/vout/DisplayPort/DPTX_IP/dptx_IP_REG_T7.h
+++ b/drivers/media/vout/DisplayPort/DPTX_IP/dptx_IP_REG_T7.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
  * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
diff --git a/drivers/media/vout/DisplayPort/DPTX_IP/dptx_IP_ctrls.h b/drivers/media/vout/DisplayPort/DPTX_IP/dptx_IP_ctrls.h
index ca7f5359c..54b676c39 100644
--- a/drivers/media/vout/DisplayPort/DPTX_IP/dptx_IP_ctrls.h
+++ b/drivers/media/vout/DisplayPort/DPTX_IP/dptx_IP_ctrls.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
  * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
diff --git a/drivers/media/vout/DisplayPort/DPTX_IP/dptx_IP_interface.c b/drivers/media/vout/DisplayPort/DPTX_IP/dptx_IP_interface.c
index c04368188..3952b862b 100644
--- a/drivers/media/vout/DisplayPort/DPTX_IP/dptx_IP_interface.c
+++ b/drivers/media/vout/DisplayPort/DPTX_IP/dptx_IP_interface.c
@@ -1,8 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/DisplayPort/PHY/dptx_phy_config.h b/drivers/media/vout/DisplayPort/PHY/dptx_phy_config.h
index f0206e94f..797b03611 100644
--- a/drivers/media/vout/DisplayPort/PHY/dptx_phy_config.h
+++ b/drivers/media/vout/DisplayPort/PHY/dptx_phy_config.h
@@ -1,8 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef _AML_DPTX_PHY_CONFIG_H
diff --git a/drivers/media/vout/DisplayPort/VENC/dptx_venc.h b/drivers/media/vout/DisplayPort/VENC/dptx_venc.h
index 9b7a1aa08..e53dbab79 100644
--- a/drivers/media/vout/DisplayPort/VENC/dptx_venc.h
+++ b/drivers/media/vout/DisplayPort/VENC/dptx_venc.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
  * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
diff --git a/drivers/media/vout/DisplayPort/dptx_common.h b/drivers/media/vout/DisplayPort/dptx_common.h
index 11e21e47b..581acb9fd 100644
--- a/drivers/media/vout/DisplayPort/dptx_common.h
+++ b/drivers/media/vout/DisplayPort/dptx_common.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
  * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
diff --git a/drivers/media/vout/DisplayPort/dptx_debug.c b/drivers/media/vout/DisplayPort/dptx_debug.c
index a8393dbf8..26336d467 100644
--- a/drivers/media/vout/DisplayPort/dptx_debug.c
+++ b/drivers/media/vout/DisplayPort/dptx_debug.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/DisplayPort/dptx_debug.h b/drivers/media/vout/DisplayPort/dptx_debug.h
index b5fa26d5b..c417e71ef 100644
--- a/drivers/media/vout/DisplayPort/dptx_debug.h
+++ b/drivers/media/vout/DisplayPort/dptx_debug.h
@@ -1,8 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef __AML_LCD_DEBUG_H__
diff --git a/drivers/media/vout/DisplayPort/dptx_driver.c b/drivers/media/vout/DisplayPort/dptx_driver.c
index 1034cffe9..2f59d5202 100644
--- a/drivers/media/vout/DisplayPort/dptx_driver.c
+++ b/drivers/media/vout/DisplayPort/dptx_driver.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/DisplayPort/dptx_notify.c b/drivers/media/vout/DisplayPort/dptx_notify.c
index 52c39728e..de1c2752b 100644
--- a/drivers/media/vout/DisplayPort/dptx_notify.c
+++ b/drivers/media/vout/DisplayPort/dptx_notify.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/module.h>
diff --git a/drivers/media/vout/DisplayPort/dptx_reg_op.c b/drivers/media/vout/DisplayPort/dptx_reg_op.c
index 5190dc603..5b54b4842 100644
--- a/drivers/media/vout/DisplayPort/dptx_reg_op.c
+++ b/drivers/media/vout/DisplayPort/dptx_reg_op.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/DisplayPort/dptx_reg_op.h b/drivers/media/vout/DisplayPort/dptx_reg_op.h
index 762f19626..eebc86900 100644
--- a/drivers/media/vout/DisplayPort/dptx_reg_op.h
+++ b/drivers/media/vout/DisplayPort/dptx_reg_op.h
@@ -1,9 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef __DPTX_REG_H__
diff --git a/drivers/media/vout/DisplayPort/dptx_vout.c b/drivers/media/vout/DisplayPort/dptx_vout.c
index 4bea833a3..1427c2f86 100644
--- a/drivers/media/vout/DisplayPort/dptx_vout.c
+++ b/drivers/media/vout/DisplayPort/dptx_vout.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/DisplayPort/dptx_vout_serve.c b/drivers/media/vout/DisplayPort/dptx_vout_serve.c
index a403b133e..14eb4ebbc 100644
--- a/drivers/media/vout/DisplayPort/dptx_vout_serve.c
+++ b/drivers/media/vout/DisplayPort/dptx_vout_serve.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/backlight/bl_extern/bl_extern.c b/drivers/media/vout/lcd/backlight/bl_extern/bl_extern.c
index 73ba34438..4728007f3 100644
--- a/drivers/media/vout/lcd/backlight/bl_extern/bl_extern.c
+++ b/drivers/media/vout/lcd/backlight/bl_extern/bl_extern.c
@@ -1,3 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
diff --git a/drivers/media/vout/lcd/backlight/bl_extern/bl_extern.h b/drivers/media/vout/lcd/backlight/bl_extern/bl_extern.h
index 9d11be763..d93b40ce1 100644
--- a/drivers/media/vout/lcd/backlight/bl_extern/bl_extern.h
+++ b/drivers/media/vout/lcd/backlight/bl_extern/bl_extern.h
@@ -1,8 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef _BL_EXTERN_H_
diff --git a/drivers/media/vout/lcd/backlight/bl_extern/bl_extern_i2c.c b/drivers/media/vout/lcd/backlight/bl_extern/bl_extern_i2c.c
index 18011b86a..24617091b 100644
--- a/drivers/media/vout/lcd/backlight/bl_extern/bl_extern_i2c.c
+++ b/drivers/media/vout/lcd/backlight/bl_extern/bl_extern_i2c.c
@@ -1,3 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/i2c.h>
diff --git a/drivers/media/vout/lcd/backlight/bl_extern/i2c_lp8556.c b/drivers/media/vout/lcd/backlight/bl_extern/i2c_lp8556.c
index dcb4d43e8..452f330f7 100644
--- a/drivers/media/vout/lcd/backlight/bl_extern/i2c_lp8556.c
+++ b/drivers/media/vout/lcd/backlight/bl_extern/i2c_lp8556.c
@@ -1,3 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
diff --git a/drivers/media/vout/lcd/backlight/bl_extern/mipi_lt070me05.c b/drivers/media/vout/lcd/backlight/bl_extern/mipi_lt070me05.c
index ea66884c9..05bedf35c 100644
--- a/drivers/media/vout/lcd/backlight/bl_extern/mipi_lt070me05.c
+++ b/drivers/media/vout/lcd/backlight/bl_extern/mipi_lt070me05.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/media/vout/lcd/backlight/bl_ldim/global_bl.c b/drivers/media/vout/lcd/backlight/bl_ldim/global_bl.c
index 4396e8c6e..18f547eb4 100644
--- a/drivers/media/vout/lcd/backlight/bl_ldim/global_bl.c
+++ b/drivers/media/vout/lcd/backlight/bl_ldim/global_bl.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/backlight/bl_ldim/iw7027_bl.c b/drivers/media/vout/lcd/backlight/bl_ldim/iw7027_bl.c
index 9767bf9e7..f25533cdf 100644
--- a/drivers/media/vout/lcd/backlight/bl_ldim/iw7027_bl.c
+++ b/drivers/media/vout/lcd/backlight/bl_ldim/iw7027_bl.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/backlight/bl_ldim/iw7038_bl.c b/drivers/media/vout/lcd/backlight/bl_ldim/iw7038_bl.c
index a8137f549..f64cfdadb 100644
--- a/drivers/media/vout/lcd/backlight/bl_ldim/iw7038_bl.c
+++ b/drivers/media/vout/lcd/backlight/bl_ldim/iw7038_bl.c
@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
+
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/media/vout/lcd/backlight/bl_ldim/ldim_dev_drv.c b/drivers/media/vout/lcd/backlight/bl_ldim/ldim_dev_drv.c
index a171dcf4e..072f2be58 100644
--- a/drivers/media/vout/lcd/backlight/bl_ldim/ldim_dev_drv.c
+++ b/drivers/media/vout/lcd/backlight/bl_ldim/ldim_dev_drv.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/backlight/bl_ldim/ldim_dev_drv.h b/drivers/media/vout/lcd/backlight/bl_ldim/ldim_dev_drv.h
index e2c9d451d..757b39f01 100644
--- a/drivers/media/vout/lcd/backlight/bl_ldim/ldim_dev_drv.h
+++ b/drivers/media/vout/lcd/backlight/bl_ldim/ldim_dev_drv.h
@@ -1,8 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef __LDIM_DEV_DRV_H
diff --git a/drivers/media/vout/lcd/backlight/bl_ldim/ldim_drv.c b/drivers/media/vout/lcd/backlight/bl_ldim/ldim_drv.c
index fc3a07b98..f79519067 100644
--- a/drivers/media/vout/lcd/backlight/bl_ldim/ldim_drv.c
+++ b/drivers/media/vout/lcd/backlight/bl_ldim/ldim_drv.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/version.h>
diff --git a/drivers/media/vout/lcd/backlight/bl_ldim/ldim_drv.h b/drivers/media/vout/lcd/backlight/bl_ldim/ldim_drv.h
index 62ccb6c9b..4567e98c3 100644
--- a/drivers/media/vout/lcd/backlight/bl_ldim/ldim_drv.h
+++ b/drivers/media/vout/lcd/backlight/bl_ldim/ldim_drv.h
@@ -1,8 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef _AML_LDIM_DRV_H_
diff --git a/drivers/media/vout/lcd/backlight/bl_ldim/ldim_reg.c b/drivers/media/vout/lcd/backlight/bl_ldim/ldim_reg.c
index 4643c2ff8..fd05c3816 100644
--- a/drivers/media/vout/lcd/backlight/bl_ldim/ldim_reg.c
+++ b/drivers/media/vout/lcd/backlight/bl_ldim/ldim_reg.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Copyright (c) 2021 Amlogic, Inc. All rights reserved.
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include "ldim_reg.h"
diff --git a/drivers/media/vout/lcd/backlight/bl_ldim/ldim_reg.h b/drivers/media/vout/lcd/backlight/bl_ldim/ldim_reg.h
index 7e0cbfa30..8fc711f71 100644
--- a/drivers/media/vout/lcd/backlight/bl_ldim/ldim_reg.h
+++ b/drivers/media/vout/lcd/backlight/bl_ldim/ldim_reg.h
@@ -1,10 +1,8 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
+
 #include "../../lcd_reg.h"
 
 #ifndef CONFIG_AMLOGIC_MEDIA_RDMA
diff --git a/drivers/media/vout/lcd/backlight/bl_ldim/ldim_spi.c b/drivers/media/vout/lcd/backlight/bl_ldim/ldim_spi.c
index 9947cfe99..a6b8e7e43 100644
--- a/drivers/media/vout/lcd/backlight/bl_ldim/ldim_spi.c
+++ b/drivers/media/vout/lcd/backlight/bl_ldim/ldim_spi.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/backlight/bl_ldim/ob3350_bl.c b/drivers/media/vout/lcd/backlight/bl_ldim/ob3350_bl.c
index ba5fa9d47..9d63fce28 100644
--- a/drivers/media/vout/lcd/backlight/bl_ldim/ob3350_bl.c
+++ b/drivers/media/vout/lcd/backlight/bl_ldim/ob3350_bl.c
@@ -1,3 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/types.h>
diff --git a/drivers/media/vout/lcd/backlight/bl_pwm.c b/drivers/media/vout/lcd/backlight/bl_pwm.c
index a55bfa4a8..20cb0af4b 100644
--- a/drivers/media/vout/lcd/backlight/bl_pwm.c
+++ b/drivers/media/vout/lcd/backlight/bl_pwm.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/backlight/lcd_bl.c b/drivers/media/vout/lcd/backlight/lcd_bl.c
index 90b783d0c..1be9e8485 100644
--- a/drivers/media/vout/lcd/backlight/lcd_bl.c
+++ b/drivers/media/vout/lcd/backlight/lcd_bl.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/backlight/lcd_bl.h b/drivers/media/vout/lcd/backlight/lcd_bl.h
index c0863409b..81414ecd5 100644
--- a/drivers/media/vout/lcd/backlight/lcd_bl.h
+++ b/drivers/media/vout/lcd/backlight/lcd_bl.h
@@ -1,9 +1,8 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
+
 #ifndef __AML_BL_DRV_H__
 #define __AML_BL_DRV_H__
 #include <linux/amlogic/media/vout/lcd/aml_bl.h>
diff --git a/drivers/media/vout/lcd/connectors/lvds.c b/drivers/media/vout/lcd/connectors/lvds.c
index 6acf46bb7..aa4440025 100644
--- a/drivers/media/vout/lcd/connectors/lvds.c
+++ b/drivers/media/vout/lcd/connectors/lvds.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/connectors/tcon/lcd_tcon.c b/drivers/media/vout/lcd/connectors/tcon/lcd_tcon.c
index 03788c479..2b077234b 100644
--- a/drivers/media/vout/lcd/connectors/tcon/lcd_tcon.c
+++ b/drivers/media/vout/lcd/connectors/tcon/lcd_tcon.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/connectors/tcon/lcd_tcon.h b/drivers/media/vout/lcd/connectors/tcon/lcd_tcon.h
index 6484afe55..c8bb42e64 100644
--- a/drivers/media/vout/lcd/connectors/tcon/lcd_tcon.h
+++ b/drivers/media/vout/lcd/connectors/tcon/lcd_tcon.h
@@ -1,8 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef __AML_LCD_TCON_H__
diff --git a/drivers/media/vout/lcd/connectors/vbyone.c b/drivers/media/vout/lcd/connectors/vbyone.c
index 5d24f0781..4e9ae79e0 100644
--- a/drivers/media/vout/lcd/connectors/vbyone.c
+++ b/drivers/media/vout/lcd/connectors/vbyone.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/lcd_clk/lcd_clk_c3.c b/drivers/media/vout/lcd/lcd_clk/lcd_clk_c3.c
index 212880d86..a0d0088f9 100644
--- a/drivers/media/vout/lcd/lcd_clk/lcd_clk_c3.c
+++ b/drivers/media/vout/lcd/lcd_clk/lcd_clk_c3.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/lcd_clk/lcd_clk_config.h b/drivers/media/vout/lcd/lcd_clk/lcd_clk_config.h
index 67bd113c8..c8225907b 100644
--- a/drivers/media/vout/lcd/lcd_clk/lcd_clk_config.h
+++ b/drivers/media/vout/lcd/lcd_clk/lcd_clk_config.h
@@ -1,8 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef _LCD_CLK_CONFIG_H
diff --git a/drivers/media/vout/lcd/lcd_clk/lcd_clk_ctrl.h b/drivers/media/vout/lcd/lcd_clk/lcd_clk_ctrl.h
index 2a1da7925..26032560b 100644
--- a/drivers/media/vout/lcd/lcd_clk/lcd_clk_ctrl.h
+++ b/drivers/media/vout/lcd/lcd_clk/lcd_clk_ctrl.h
@@ -1,8 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef _LCD_CLK_CONFIG_CTRL_H
diff --git a/drivers/media/vout/lcd/lcd_clk/lcd_clk_g12.c b/drivers/media/vout/lcd/lcd_clk/lcd_clk_g12.c
index a0d8cd6f3..193897a19 100644
--- a/drivers/media/vout/lcd/lcd_clk/lcd_clk_g12.c
+++ b/drivers/media/vout/lcd/lcd_clk/lcd_clk_g12.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/lcd_clk/lcd_clk_if.c b/drivers/media/vout/lcd/lcd_clk/lcd_clk_if.c
index 2c3d2692d..58b180e8b 100644
--- a/drivers/media/vout/lcd/lcd_clk/lcd_clk_if.c
+++ b/drivers/media/vout/lcd/lcd_clk/lcd_clk_if.c
@@ -1,8 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/lcd_clk/lcd_clk_s6.c b/drivers/media/vout/lcd/lcd_clk/lcd_clk_s6.c
index 8c2777251..2fccf6556 100644
--- a/drivers/media/vout/lcd/lcd_clk/lcd_clk_s6.c
+++ b/drivers/media/vout/lcd/lcd_clk/lcd_clk_s6.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/lcd_clk/lcd_clk_t3x.c b/drivers/media/vout/lcd/lcd_clk/lcd_clk_t3x.c
index 3c9316bbb..a57ce1c3d 100644
--- a/drivers/media/vout/lcd/lcd_clk/lcd_clk_t3x.c
+++ b/drivers/media/vout/lcd/lcd_clk/lcd_clk_t3x.c
@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
+
 #include <linux/init.h>
 #include <linux/version.h>
 #include <linux/types.h>
diff --git a/drivers/media/vout/lcd/lcd_clk/lcd_clk_t5d.c b/drivers/media/vout/lcd/lcd_clk/lcd_clk_t5d.c
index a19fa16a6..97861eeba 100644
--- a/drivers/media/vout/lcd/lcd_clk/lcd_clk_t5d.c
+++ b/drivers/media/vout/lcd/lcd_clk/lcd_clk_t5d.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/lcd_clk/lcd_clk_t5w.c b/drivers/media/vout/lcd/lcd_clk/lcd_clk_t5w.c
index 4df7de540..e92d0ea9d 100644
--- a/drivers/media/vout/lcd/lcd_clk/lcd_clk_t5w.c
+++ b/drivers/media/vout/lcd/lcd_clk/lcd_clk_t5w.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/lcd_clk/lcd_clk_t7.c b/drivers/media/vout/lcd/lcd_clk/lcd_clk_t7.c
index 73168cb31..1d2adba28 100644
--- a/drivers/media/vout/lcd/lcd_clk/lcd_clk_t7.c
+++ b/drivers/media/vout/lcd/lcd_clk/lcd_clk_t7.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/lcd_clk/lcd_clk_tm2.c b/drivers/media/vout/lcd/lcd_clk/lcd_clk_tm2.c
index 41c4098e4..915943d00 100644
--- a/drivers/media/vout/lcd/lcd_clk/lcd_clk_tm2.c
+++ b/drivers/media/vout/lcd/lcd_clk/lcd_clk_tm2.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/lcd_clk/lcd_clk_txhd2.c b/drivers/media/vout/lcd/lcd_clk/lcd_clk_txhd2.c
index bf2d6980c..a854881b4 100644
--- a/drivers/media/vout/lcd/lcd_clk/lcd_clk_txhd2.c
+++ b/drivers/media/vout/lcd/lcd_clk/lcd_clk_txhd2.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 /* include clk for chip: tl1 tm2 t5 t5d*/
diff --git a/drivers/media/vout/lcd/lcd_clk/lcd_clk_utils.c b/drivers/media/vout/lcd/lcd_clk/lcd_clk_utils.c
index 848eee19f..132e49e0a 100644
--- a/drivers/media/vout/lcd/lcd_clk/lcd_clk_utils.c
+++ b/drivers/media/vout/lcd/lcd_clk/lcd_clk_utils.c
@@ -1,8 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/lcd_clk/lcd_clk_utils.h b/drivers/media/vout/lcd/lcd_clk/lcd_clk_utils.h
index 485161821..0ecc8e35d 100644
--- a/drivers/media/vout/lcd/lcd_clk/lcd_clk_utils.h
+++ b/drivers/media/vout/lcd/lcd_clk/lcd_clk_utils.h
@@ -1,8 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef _LCD_CLK_UTILS_H
diff --git a/drivers/media/vout/lcd/lcd_common.c b/drivers/media/vout/lcd/lcd_common.c
index aa6618fc2..2750e58ff 100644
--- a/drivers/media/vout/lcd/lcd_common.c
+++ b/drivers/media/vout/lcd/lcd_common.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/lcd_common.h b/drivers/media/vout/lcd/lcd_common.h
index 976a59d8a..e40647306 100644
--- a/drivers/media/vout/lcd/lcd_common.h
+++ b/drivers/media/vout/lcd/lcd_common.h
@@ -1,8 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef __AML_LCD_COMMON_H__
diff --git a/drivers/media/vout/lcd/lcd_debug.c b/drivers/media/vout/lcd/lcd_debug.c
index 4059dc6ab..d5cfb636f 100644
--- a/drivers/media/vout/lcd/lcd_debug.c
+++ b/drivers/media/vout/lcd/lcd_debug.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/lcd_debug.h b/drivers/media/vout/lcd/lcd_debug.h
index d76723c6c..650e00772 100644
--- a/drivers/media/vout/lcd/lcd_debug.h
+++ b/drivers/media/vout/lcd/lcd_debug.h
@@ -1,8 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef __AML_LCD_DEBUG_H__
diff --git a/drivers/media/vout/lcd/lcd_dphy_ctrl.c b/drivers/media/vout/lcd/lcd_dphy_ctrl.c
index 66357b5c2..11655cf1d 100644
--- a/drivers/media/vout/lcd/lcd_dphy_ctrl.c
+++ b/drivers/media/vout/lcd/lcd_dphy_ctrl.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/lcd_extern/ext_default.c b/drivers/media/vout/lcd/lcd_extern/ext_default.c
index b870cc94c..e1a00e6fc 100644
--- a/drivers/media/vout/lcd/lcd_extern/ext_default.c
+++ b/drivers/media/vout/lcd/lcd_extern/ext_default.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/media/vout/lcd/lcd_extern/ext_func.c b/drivers/media/vout/lcd/lcd_extern/ext_func.c
index 78dd3c4a0..f86eca43b 100644
--- a/drivers/media/vout/lcd/lcd_extern/ext_func.c
+++ b/drivers/media/vout/lcd/lcd_extern/ext_func.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/lcd_extern/ext_i2c_dev.c b/drivers/media/vout/lcd/lcd_extern/ext_i2c_dev.c
index 3f2c49167..014d0680d 100644
--- a/drivers/media/vout/lcd/lcd_extern/ext_i2c_dev.c
+++ b/drivers/media/vout/lcd/lcd_extern/ext_i2c_dev.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/media/vout/lcd/lcd_extern/ext_spi_dev.c b/drivers/media/vout/lcd/lcd_extern/ext_spi_dev.c
index 11ebc9368..1cb4e6bc5 100644
--- a/drivers/media/vout/lcd/lcd_extern/ext_spi_dev.c
+++ b/drivers/media/vout/lcd/lcd_extern/ext_spi_dev.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/media/vout/lcd/lcd_extern/external_chip/i2c_ANX6862_7911.c b/drivers/media/vout/lcd/lcd_extern/external_chip/i2c_ANX6862_7911.c
index e0032244f..5515b2fbe 100644
--- a/drivers/media/vout/lcd/lcd_extern/external_chip/i2c_ANX6862_7911.c
+++ b/drivers/media/vout/lcd/lcd_extern/external_chip/i2c_ANX6862_7911.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/media/vout/lcd/lcd_extern/i2c_ANX6862_7911.c b/drivers/media/vout/lcd/lcd_extern/i2c_ANX6862_7911.c
index 28c7f1407..be6bdb68b 100644
--- a/drivers/media/vout/lcd/lcd_extern/i2c_ANX6862_7911.c
+++ b/drivers/media/vout/lcd/lcd_extern/i2c_ANX6862_7911.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/media/vout/lcd/lcd_extern/lcd_extern.c b/drivers/media/vout/lcd/lcd_extern/lcd_extern.c
index ff173fadb..8039a2b4e 100644
--- a/drivers/media/vout/lcd/lcd_extern/lcd_extern.c
+++ b/drivers/media/vout/lcd/lcd_extern/lcd_extern.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/lcd_extern/lcd_extern.h b/drivers/media/vout/lcd/lcd_extern/lcd_extern.h
index 25d78e0a0..4be05bed7 100644
--- a/drivers/media/vout/lcd/lcd_extern/lcd_extern.h
+++ b/drivers/media/vout/lcd/lcd_extern/lcd_extern.h
@@ -1,8 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef _LCD_EXTERN_H_
diff --git a/drivers/media/vout/lcd/lcd_mode_tablet.c b/drivers/media/vout/lcd/lcd_mode_tablet.c
index b56f96a9b..b53d56f2c 100644
--- a/drivers/media/vout/lcd/lcd_mode_tablet.c
+++ b/drivers/media/vout/lcd/lcd_mode_tablet.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/lcd_mode_tv.c b/drivers/media/vout/lcd/lcd_mode_tv.c
index 76056973e..95b521015 100644
--- a/drivers/media/vout/lcd/lcd_mode_tv.c
+++ b/drivers/media/vout/lcd/lcd_mode_tv.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/lcd_notify.c b/drivers/media/vout/lcd/lcd_notify.c
index 532a4c4b3..34a20a71c 100644
--- a/drivers/media/vout/lcd/lcd_notify.c
+++ b/drivers/media/vout/lcd/lcd_notify.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/module.h>
diff --git a/drivers/media/vout/lcd/lcd_phy/lcd_phy_config.h b/drivers/media/vout/lcd/lcd_phy/lcd_phy_config.h
index 005943917..c43814709 100644
--- a/drivers/media/vout/lcd/lcd_phy/lcd_phy_config.h
+++ b/drivers/media/vout/lcd/lcd_phy/lcd_phy_config.h
@@ -1,8 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef __AML_LCD_PHY_CONFIG_H__
diff --git a/drivers/media/vout/lcd/lcd_reg.c b/drivers/media/vout/lcd/lcd_reg.c
index abfa05105..55a7dd183 100644
--- a/drivers/media/vout/lcd/lcd_reg.c
+++ b/drivers/media/vout/lcd/lcd_reg.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/lcd_reg.h b/drivers/media/vout/lcd/lcd_reg.h
index 0a7e7c985..7cbd46fec 100644
--- a/drivers/media/vout/lcd/lcd_reg.h
+++ b/drivers/media/vout/lcd/lcd_reg.h
@@ -1,9 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef __LCD_REG_H__
diff --git a/drivers/media/vout/lcd/lcd_venc/lcd_venc_t7.c b/drivers/media/vout/lcd/lcd_venc/lcd_venc_t7.c
index e2651cc18..3b85dbebd 100644
--- a/drivers/media/vout/lcd/lcd_venc/lcd_venc_t7.c
+++ b/drivers/media/vout/lcd/lcd_venc/lcd_venc_t7.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/media/vout/lcd/lcd_vout.c b/drivers/media/vout/lcd/lcd_vout.c
index 2fe7cbe56..353b1519f 100644
--- a/drivers/media/vout/lcd/lcd_vout.c
+++ b/drivers/media/vout/lcd/lcd_vout.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/init.h>
diff --git a/drivers/memory_debug/ddr_tool/dmc_a4.c b/drivers/memory_debug/ddr_tool/dmc_a4.c
index c9aa416a4..b67b35b3c 100644
--- a/drivers/memory_debug/ddr_tool/dmc_a4.c
+++ b/drivers/memory_debug/ddr_tool/dmc_a4.c
@@ -1,3 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #include <linux/of_fdt.h>
 #include <linux/irqreturn.h>
 #include <linux/module.h>
diff --git a/drivers/memory_debug/ddr_tool/dmc_trace.h b/drivers/memory_debug/ddr_tool/dmc_trace.h
index 74c894b13..63c5fd3fe 100644
--- a/drivers/memory_debug/ddr_tool/dmc_trace.h
+++ b/drivers/memory_debug/ddr_tool/dmc_trace.h
@@ -1,4 +1,8 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #if !defined(_TRACE_DMC_MONITOR_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_DMC_MONITOR_H
 
diff --git a/drivers/memory_ext/dma_pcie_mapping.c b/drivers/memory_ext/dma_pcie_mapping.c
index 1ca9e5830..f874cc138 100644
--- a/drivers/memory_ext/dma_pcie_mapping.c
+++ b/drivers/memory_ext/dma_pcie_mapping.c
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- *opyright (c) 2019 Amlogic, Inc. All rights reserved.
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
+
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
diff --git a/drivers/pci/controller/amlogic-pcie-v2-host.c b/drivers/pci/controller/amlogic-pcie-v2-host.c
index 9f5ef06c5..1a7ce600d 100644
--- a/drivers/pci/controller/amlogic-pcie-v2-host.c
+++ b/drivers/pci/controller/amlogic-pcie-v2-host.c
@@ -1,8 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * PCIe host controller driver for Amlogic MESON SoCs
- *
- * Copyright (c) 2018 Amlogic, inc.
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/dwc_otg/310/common_port/dwc_common_linux.c b/drivers/usb/dwc_otg/310/common_port/dwc_common_linux.c
index 1fa5d1283..b6365a30f 100644
--- a/drivers/usb/dwc_otg/310/common_port/dwc_common_linux.c
+++ b/drivers/usb/dwc_otg/310/common_port/dwc_common_linux.c
@@ -1,3 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
diff --git a/drivers/usb/dwc_otg/310/common_port/dwc_mem.c b/drivers/usb/dwc_otg/310/common_port/dwc_mem.c
index cf2c39940..d78fb8b58 100644
--- a/drivers/usb/dwc_otg/310/common_port/dwc_mem.c
+++ b/drivers/usb/dwc_otg/310/common_port/dwc_mem.c
@@ -1,4 +1,8 @@
-/* Memory Debugging */
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #ifdef DWC_DEBUG_MEMORY
 
 #include "dwc_os.h"
diff --git a/drivers/usb/dwc_otg/310/common_port/dwc_modpow.h b/drivers/usb/dwc_otg/310/common_port/dwc_modpow.h
index 43b80a169..3e5460dd0 100644
--- a/drivers/usb/dwc_otg/310/common_port/dwc_modpow.h
+++ b/drivers/usb/dwc_otg/310/common_port/dwc_modpow.h
@@ -1,7 +1,8 @@
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- * dwc_modpow.h
- * See dwc_modpow.c for license and changes
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
+
 #ifndef _DWC_MODPOW_H
 #define _DWC_MODPOW_H
 
diff --git a/drivers/usb/dwc_otg/310/common_port/dwc_notifier.c b/drivers/usb/dwc_otg/310/common_port/dwc_notifier.c
index 8382ef230..f715efc37 100644
--- a/drivers/usb/dwc_otg/310/common_port/dwc_notifier.c
+++ b/drivers/usb/dwc_otg/310/common_port/dwc_notifier.c
@@ -1,3 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #ifdef DWC_NOTIFYLIB
 
 #include "dwc_notifier.h"
diff --git a/drivers/usb/dwc_otg/310/common_port/dwc_notifier.h b/drivers/usb/dwc_otg/310/common_port/dwc_notifier.h
index 82d98eb3e..f6dab7cf8 100644
--- a/drivers/usb/dwc_otg/310/common_port/dwc_notifier.h
+++ b/drivers/usb/dwc_otg/310/common_port/dwc_notifier.h
@@ -1,3 +1,8 @@
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #ifndef __DWC_NOTIFIER_H__
 #define __DWC_NOTIFIER_H__
 
diff --git a/drivers/usb/dwc_otg/310/dwc_otg_os_dep.h b/drivers/usb/dwc_otg/310/dwc_otg_os_dep.h
index 3768dcf94..c1a9a8ac3 100644
--- a/drivers/usb/dwc_otg/310/dwc_otg_os_dep.h
+++ b/drivers/usb/dwc_otg/310/dwc_otg_os_dep.h
@@ -1,3 +1,8 @@
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #ifndef _DWC_OS_DEP_H_
 #define _DWC_OS_DEP_H_
 
diff --git a/drivers/usb/xhci_amlogic/pci-quirks-meson.h b/drivers/usb/xhci_amlogic/pci-quirks-meson.h
index e646445fd..8d2cf8332 100644
--- a/drivers/usb/xhci_amlogic/pci-quirks-meson.h
+++ b/drivers/usb/xhci_amlogic/pci-quirks-meson.h
@@ -1,4 +1,8 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #ifndef __LINUX_USB_PCI_QUIRKS_H
 #define __LINUX_USB_PCI_QUIRKS_H
 
diff --git a/drivers/yaffs2/yport.h b/drivers/yaffs2/yport.h
index 423c42d8e..a59eed2b7 100644
--- a/drivers/yaffs2/yport.h
+++ b/drivers/yaffs2/yport.h
@@ -1,3 +1,8 @@
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #ifndef _Y_PORT_H_
 #define _Y_PORT_H_
 
diff --git a/include/drm/drm_agpsupport.h b/include/drm/drm_agpsupport.h
index ff26ad954..7f31c2a41 100644
--- a/include/drm/drm_agpsupport.h
+++ b/include/drm/drm_agpsupport.h
@@ -1,4 +1,8 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #ifndef _DRM_AGPSUPPORT_H_
 #define _DRM_AGPSUPPORT_H_
 
diff --git a/include/drm/drm_os_linux.h b/include/drm/drm_os_linux.h
index ee8d61b64..c90dd867c 100644
--- a/include/drm/drm_os_linux.h
+++ b/include/drm/drm_os_linux.h
@@ -1,7 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/**
- * \file drm_os_linux.h
- * OS abstraction macros.
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/interrupt.h>	/* For task queue support */
diff --git a/include/dt-bindings/clock/g12a-audio-clk.h b/include/dt-bindings/clock/g12a-audio-clk.h
index ef053f3ff..62818dd2d 100644
--- a/include/dt-bindings/clock/g12a-audio-clk.h
+++ b/include/dt-bindings/clock/g12a-audio-clk.h
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- * Meson-G12A Audio clock tree IDs
- *
  * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
diff --git a/include/dt-bindings/clock/sm1-audio-clk.h b/include/dt-bindings/clock/sm1-audio-clk.h
index ea9deca68..94e8856b7 100644
--- a/include/dt-bindings/clock/sm1-audio-clk.h
+++ b/include/dt-bindings/clock/sm1-audio-clk.h
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- * Meson-SM1 Audio clock tree IDs
- *
  * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
diff --git a/include/dt-bindings/reset/amlogic,meson-a1-reset.h b/include/dt-bindings/reset/amlogic,meson-a1-reset.h
index 8d76a47a7..897ce6bcd 100644
--- a/include/dt-bindings/reset/amlogic,meson-a1-reset.h
+++ b/include/dt-bindings/reset/amlogic,meson-a1-reset.h
@@ -1,8 +1,6 @@
-/* SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- *
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
  * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
- * Author: Xingyu Chen <xingyu.chen@amlogic.com>
- *
  */
 
 #ifndef _DT_BINDINGS_AMLOGIC_MESON_A1_RESET_H
diff --git a/include/linux/amlogic/media/sound/aout_notify.h b/include/linux/amlogic/media/sound/aout_notify.h
index f8fc04901..3fec8f867 100644
--- a/include/linux/amlogic/media/sound/aout_notify.h
+++ b/include/linux/amlogic/media/sound/aout_notify.h
@@ -1,4 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef _AML_NOTIFY_H
 #define _AML_NOTIFY_H
diff --git a/include/linux/amlogic/media/sound/auge_utils.h b/include/linux/amlogic/media/sound/auge_utils.h
index fc102eda8..75d1fbea8 100644
--- a/include/linux/amlogic/media/sound/auge_utils.h
+++ b/include/linux/amlogic/media/sound/auge_utils.h
@@ -1,4 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef __AUGE_UTILS_H__
 #define __AUGE_UTILS_H__
diff --git a/include/linux/amlogic/media/vout/lcd/aml_bl.h b/include/linux/amlogic/media/vout/lcd/aml_bl.h
index 13dfd8781..acd105530 100644
--- a/include/linux/amlogic/media/vout/lcd/aml_bl.h
+++ b/include/linux/amlogic/media/vout/lcd/aml_bl.h
@@ -1,9 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef __INC_AML_BL_H
diff --git a/include/linux/amlogic/media/vout/lcd/aml_bl_extern.h b/include/linux/amlogic/media/vout/lcd/aml_bl_extern.h
index 16a712564..33f0d391a 100644
--- a/include/linux/amlogic/media/vout/lcd/aml_bl_extern.h
+++ b/include/linux/amlogic/media/vout/lcd/aml_bl_extern.h
@@ -1,8 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef _INC_AML_BL_EXTERN_H_
diff --git a/include/linux/amlogic/media/vout/lcd/aml_lcd.h b/include/linux/amlogic/media/vout/lcd/aml_lcd.h
index 0e57f651e..ef393088a 100644
--- a/include/linux/amlogic/media/vout/lcd/aml_lcd.h
+++ b/include/linux/amlogic/media/vout/lcd/aml_lcd.h
@@ -1,8 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef _INC_AML_LCD_COMMON_H_
diff --git a/include/linux/amlogic/media/vout/lcd/aml_ldim.h b/include/linux/amlogic/media/vout/lcd/aml_ldim.h
index 85567eebc..8d811b9f9 100644
--- a/include/linux/amlogic/media/vout/lcd/aml_ldim.h
+++ b/include/linux/amlogic/media/vout/lcd/aml_ldim.h
@@ -1,8 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef _INC_AML_LDIM_H_
diff --git a/include/linux/amlogic/media/vout/lcd/lcd_extern.h b/include/linux/amlogic/media/vout/lcd/lcd_extern.h
index c03ba5b09..a23a217aa 100644
--- a/include/linux/amlogic/media/vout/lcd/lcd_extern.h
+++ b/include/linux/amlogic/media/vout/lcd/lcd_extern.h
@@ -1,8 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef _INC_AML_LCD_EXTERN_H_
diff --git a/include/linux/amlogic/media/vout/lcd/lcd_mipi.h b/include/linux/amlogic/media/vout/lcd/lcd_mipi.h
index 5e8cba9de..c45f7996b 100644
--- a/include/linux/amlogic/media/vout/lcd/lcd_mipi.h
+++ b/include/linux/amlogic/media/vout/lcd/lcd_mipi.h
@@ -1,8 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef _INC_LCD_MIPI_H
diff --git a/include/linux/amlogic/media/vout/lcd/lcd_notify.h b/include/linux/amlogic/media/vout/lcd/lcd_notify.h
index 65e673c45..e3426c444 100644
--- a/include/linux/amlogic/media/vout/lcd/lcd_notify.h
+++ b/include/linux/amlogic/media/vout/lcd/lcd_notify.h
@@ -1,8 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef _INC_LCD_NOTIFY_H_
diff --git a/include/linux/amlogic/media/vout/lcd/lcd_vout.h b/include/linux/amlogic/media/vout/lcd/lcd_vout.h
index 4249ec9d3..3d20269ea 100644
--- a/include/linux/amlogic/media/vout/lcd/lcd_vout.h
+++ b/include/linux/amlogic/media/vout/lcd/lcd_vout.h
@@ -1,8 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef _INC_LCD_VOUT_H
diff --git a/include/linux/amlogic/media/vout/lcd/ldim_fw.h b/include/linux/amlogic/media/vout/lcd/ldim_fw.h
index c55db70ee..1dbab7435 100644
--- a/include/linux/amlogic/media/vout/lcd/ldim_fw.h
+++ b/include/linux/amlogic/media/vout/lcd/ldim_fw.h
@@ -1,8 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef _INC_AML_LDIM_ALG_H_
diff --git a/include/linux/amlogic/symbols.h b/include/linux/amlogic/symbols.h
index 6d8e651f6..388c0e101 100644
--- a/include/linux/amlogic/symbols.h
+++ b/include/linux/amlogic/symbols.h
@@ -1,7 +1,8 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- * fs/f2fs/symbols.h
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
+
 #ifndef __SYMBOLS_H__
 #define __SYMBOLS_H__
 
diff --git a/include/linux/amlogic/vad_api.h b/include/linux/amlogic/vad_api.h
index 17d97d7a9..6ef250cef 100644
--- a/include/linux/amlogic/vad_api.h
+++ b/include/linux/amlogic/vad_api.h
@@ -1,4 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef __VAD_API_H__
 #define __VAD_API_H__
diff --git a/include/trace/events/aerofs.h b/include/trace/events/aerofs.h
index dd8db7dc0..132b2f8c6 100644
--- a/include/trace/events/aerofs.h
+++ b/include/trace/events/aerofs.h
@@ -1,4 +1,8 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM aerofs
 
diff --git a/mk.sh b/mk.sh
index eec4c54c4..3a83b1b37 100755
--- a/mk.sh
+++ b/mk.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+#
+# Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+#
 
 function show_help {
 	echo "USAGE: $0 [--abi]"
diff --git a/samples/debug_file_test/app/list.h b/samples/debug_file_test/app/list.h
index c82ef9b42..fd883a208 100644
--- a/samples/debug_file_test/app/list.h
+++ b/samples/debug_file_test/app/list.h
@@ -1,4 +1,8 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #ifndef LIST_H
 #define LIST_H
 
diff --git a/scripts/amlogic/compare_text_section.sh b/scripts/amlogic/compare_text_section.sh
index 0f86deb60..90904b51e 100755
--- a/scripts/amlogic/compare_text_section.sh
+++ b/scripts/amlogic/compare_text_section.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+#
+# Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+#
 
 # ./common/common_drivers/scripts/amlogic/compare_text_section --vmlinux_gki <path>/vmlinux --vmlinux_amlogic <path>/vmlinux
 function show_help {
diff --git a/sound/soc/amlogic/auge/audio_controller.c b/sound/soc/amlogic/auge/audio_controller.c
index 50e07f8d1..2e48016ba 100644
--- a/sound/soc/amlogic/auge/audio_controller.c
+++ b/sound/soc/amlogic/auge/audio_controller.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * audio register map
- *
- * Copyright (C) 2019 Amlogic,inc
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/device.h>
diff --git a/sound/soc/amlogic/auge/audio_controller.h b/sound/soc/amlogic/auge/audio_controller.h
index 64b869228..c2234a5be 100644
--- a/sound/soc/amlogic/auge/audio_controller.h
+++ b/sound/soc/amlogic/auge/audio_controller.h
@@ -1,4 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef __AML_AUDIO_CONTROLLER_H_
 #define __AML_AUDIO_CONTROLLER_H_
diff --git a/sound/soc/amlogic/auge/audio_io.c b/sound/soc/amlogic/auge/audio_io.c
index 2dcd43175..8ef1f0050 100644
--- a/sound/soc/amlogic/auge/audio_io.c
+++ b/sound/soc/amlogic/auge/audio_io.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * audiobus io
- *
- * Copyright (C) 2019 Amlogic,inc
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/module.h>
diff --git a/sound/soc/amlogic/auge/audio_io.h b/sound/soc/amlogic/auge/audio_io.h
index 7288cafba..f50a2ab56 100644
--- a/sound/soc/amlogic/auge/audio_io.h
+++ b/sound/soc/amlogic/auge/audio_io.h
@@ -1,4 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef __AML_AUDIO_IO_H_
 #define __AML_AUDIO_IO_H_
diff --git a/sound/soc/amlogic/auge/audio_utils.c b/sound/soc/amlogic/auge/audio_utils.c
index 337ef2492..d154519b5 100644
--- a/sound/soc/amlogic/auge/audio_utils.c
+++ b/sound/soc/amlogic/auge/audio_utils.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * audio utils
- *
- * Copyright (C) 2019 Amlogic,inc
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/amlogic/iomap.h>
diff --git a/sound/soc/amlogic/auge/audio_utils.h b/sound/soc/amlogic/auge/audio_utils.h
index 152ce536a..b2a659a9e 100644
--- a/sound/soc/amlogic/auge/audio_utils.h
+++ b/sound/soc/amlogic/auge/audio_utils.h
@@ -1,4 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef __AML_AUDIO_UTILS_H__
 #define __AML_AUDIO_UTILS_H__
diff --git a/sound/soc/amlogic/auge/card.c b/sound/soc/amlogic/auge/card.c
index 4773963f6..104430920 100644
--- a/sound/soc/amlogic/auge/card.c
+++ b/sound/soc/amlogic/auge/card.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Amlogic Generic ASoC Sound Card driver
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 //#define DEBUG
diff --git a/sound/soc/amlogic/auge/card.h b/sound/soc/amlogic/auge/card.h
index f77c363c7..ff7a8ea26 100644
--- a/sound/soc/amlogic/auge/card.h
+++ b/sound/soc/amlogic/auge/card.h
@@ -1,4 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef __AML_CARD_H_
 #define __AML_CARD_H_
diff --git a/sound/soc/amlogic/auge/card_utils.c b/sound/soc/amlogic/auge/card_utils.c
index 4fc3f8dad..d263ded3b 100644
--- a/sound/soc/amlogic/auge/card_utils.c
+++ b/sound/soc/amlogic/auge/card_utils.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * card utils
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/clk.h>
diff --git a/sound/soc/amlogic/auge/card_utils.h b/sound/soc/amlogic/auge/card_utils.h
index b8f1c8235..edfafe078 100644
--- a/sound/soc/amlogic/auge/card_utils.h
+++ b/sound/soc/amlogic/auge/card_utils.h
@@ -1,4 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef __AML_CARD_CORE_H
 #define __AML_CARD_CORE_H
diff --git a/sound/soc/amlogic/auge/clks/audio_clks.c b/sound/soc/amlogic/auge/clks/audio_clks.c
index edd9f0bb0..3d9ff3420 100644
--- a/sound/soc/amlogic/auge/clks/audio_clks.c
+++ b/sound/soc/amlogic/auge/clks/audio_clks.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Audio clock driver
- *
- * Copyright (C) 2019 Amlogic,inc
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #undef pr_fmt
diff --git a/sound/soc/amlogic/auge/clks/audio_clks.h b/sound/soc/amlogic/auge/clks/audio_clks.h
index d8f6c729d..d14abd7c0 100644
--- a/sound/soc/amlogic/auge/clks/audio_clks.h
+++ b/sound/soc/amlogic/auge/clks/audio_clks.h
@@ -1,4 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef __AML_AUDIO_CLKS_H__
 #define __AML_AUDIO_CLKS_H__
diff --git a/sound/soc/amlogic/auge/clks/clk-a1.c b/sound/soc/amlogic/auge/clks/clk-a1.c
index 752b1abe0..a3f4ca7ae 100644
--- a/sound/soc/amlogic/auge/clks/clk-a1.c
+++ b/sound/soc/amlogic/auge/clks/clk-a1.c
@@ -1,7 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #undef pr_fmt
diff --git a/sound/soc/amlogic/auge/clks/clk-sm1.c b/sound/soc/amlogic/auge/clks/clk-sm1.c
index 0d5e03001..e7177955d 100644
--- a/sound/soc/amlogic/auge/clks/clk-sm1.c
+++ b/sound/soc/amlogic/auge/clks/clk-sm1.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * SM1 audio clocks driver
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #undef pr_fmt
diff --git a/sound/soc/amlogic/auge/ddr_mngr.c b/sound/soc/amlogic/auge/ddr_mngr.c
index 913d04070..17cf9f44a 100644
--- a/sound/soc/amlogic/auge/ddr_mngr.c
+++ b/sound/soc/amlogic/auge/ddr_mngr.c
@@ -1,7 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 //#define DEBUG
diff --git a/sound/soc/amlogic/auge/earc.c b/sound/soc/amlogic/auge/earc.c
index 95fb4a132..760dc0d04 100644
--- a/sound/soc/amlogic/auge/earc.c
+++ b/sound/soc/amlogic/auge/earc.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * eARC/ARC ALSA SoC driver
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 //#define DEBUG
diff --git a/sound/soc/amlogic/auge/earc_hw.c b/sound/soc/amlogic/auge/earc_hw.c
index eb0b5c8f0..e68319cbe 100644
--- a/sound/soc/amlogic/auge/earc_hw.c
+++ b/sound/soc/amlogic/auge/earc_hw.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * eARC/ARC register controls
- *
- * Copyright (C) 2019 Amlogic,inc
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/types.h>
diff --git a/sound/soc/amlogic/auge/earc_hw.h b/sound/soc/amlogic/auge/earc_hw.h
index f533303c9..6957b0200 100644
--- a/sound/soc/amlogic/auge/earc_hw.h
+++ b/sound/soc/amlogic/auge/earc_hw.h
@@ -1,4 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef __EARC_HW_H__
 #define __EARC_HW_H__
diff --git a/sound/soc/amlogic/auge/effects.c b/sound/soc/amlogic/auge/effects.c
index eac2d79d3..0daaa5c29 100644
--- a/sound/soc/amlogic/auge/effects.c
+++ b/sound/soc/amlogic/auge/effects.c
@@ -1,7 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <sound/soc.h>
diff --git a/sound/soc/amlogic/auge/effects_hw.c b/sound/soc/amlogic/auge/effects_hw.c
index a17582441..c143f0392 100644
--- a/sound/soc/amlogic/auge/effects_hw.c
+++ b/sound/soc/amlogic/auge/effects_hw.c
@@ -1,7 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/delay.h>
diff --git a/sound/soc/amlogic/auge/effects_hw_v2.c b/sound/soc/amlogic/auge/effects_hw_v2.c
index 565976272..514a503cd 100644
--- a/sound/soc/amlogic/auge/effects_hw_v2.c
+++ b/sound/soc/amlogic/auge/effects_hw_v2.c
@@ -1,7 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/kernel.h>
diff --git a/sound/soc/amlogic/auge/effects_v2.c b/sound/soc/amlogic/auge/effects_v2.c
index 6605e6820..a204b0916 100644
--- a/sound/soc/amlogic/auge/effects_v2.c
+++ b/sound/soc/amlogic/auge/effects_v2.c
@@ -1,7 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/kernel.h>
diff --git a/sound/soc/amlogic/auge/extn.c b/sound/soc/amlogic/auge/extn.c
index 682eb3f4c..a913298b2 100644
--- a/sound/soc/amlogic/auge/extn.c
+++ b/sound/soc/amlogic/auge/extn.c
@@ -1,10 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Audio External Input/Out ASoc driver
- * such as fratv, frhdmirx
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 /*#define DEBUG*/
diff --git a/sound/soc/amlogic/auge/frhdmirx_hw.c b/sound/soc/amlogic/auge/frhdmirx_hw.c
index 2826f71db..5a8f4eab8 100644
--- a/sound/soc/amlogic/auge/frhdmirx_hw.c
+++ b/sound/soc/amlogic/auge/frhdmirx_hw.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * FrHDMIRX register controls
- *
- * Copyright (C) 2019 Amlogic,inc
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/types.h>
diff --git a/sound/soc/amlogic/auge/frhdmirx_hw.h b/sound/soc/amlogic/auge/frhdmirx_hw.h
index 78e13f267..ddecc6c7e 100644
--- a/sound/soc/amlogic/auge/frhdmirx_hw.h
+++ b/sound/soc/amlogic/auge/frhdmirx_hw.h
@@ -1,4 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef __FRHDMIRX_HW_H__
 #define __FRHDMIRX_HW_H__
diff --git a/sound/soc/amlogic/auge/iomap.c b/sound/soc/amlogic/auge/iomap.c
index dd4220e17..37e70cfc9 100644
--- a/sound/soc/amlogic/auge/iomap.c
+++ b/sound/soc/amlogic/auge/iomap.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * audio iomap interface
- *
- * Copyright (C) 2019 Amlogic,inc
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 /*#define DEBUG*/
diff --git a/sound/soc/amlogic/auge/locker_hw.c b/sound/soc/amlogic/auge/locker_hw.c
index 12a66cbda..56073b582 100644
--- a/sound/soc/amlogic/auge/locker_hw.c
+++ b/sound/soc/amlogic/auge/locker_hw.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Audio locker register controls
- *
- * Copyright (C) 2019 Amlogic,inc
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/delay.h>
diff --git a/sound/soc/amlogic/auge/locker_hw.h b/sound/soc/amlogic/auge/locker_hw.h
index 82468486e..fc07a3a92 100644
--- a/sound/soc/amlogic/auge/locker_hw.h
+++ b/sound/soc/amlogic/auge/locker_hw.h
@@ -1,4 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef __AML_AUDIO_LOCKER_HW_H__
 #define __AML_AUDIO_LOCKER_HW_H__
diff --git a/sound/soc/amlogic/auge/loopback.c b/sound/soc/amlogic/auge/loopback.c
index 9d18a2548..b3321211f 100644
--- a/sound/soc/amlogic/auge/loopback.c
+++ b/sound/soc/amlogic/auge/loopback.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Amlogic loopback ASoc driverloopback_ioctl
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/kernel.h>
diff --git a/sound/soc/amlogic/auge/loopback_hw.c b/sound/soc/amlogic/auge/loopback_hw.c
index 9989f52f7..e804b9fa4 100644
--- a/sound/soc/amlogic/auge/loopback_hw.c
+++ b/sound/soc/amlogic/auge/loopback_hw.c
@@ -1,7 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 //#define DEBUG
diff --git a/sound/soc/amlogic/auge/mixer_hw.c b/sound/soc/amlogic/auge/mixer_hw.c
index 76edc76d8..d86e0fd0f 100644
--- a/sound/soc/amlogic/auge/mixer_hw.c
+++ b/sound/soc/amlogic/auge/mixer_hw.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
+
 #include<linux/delay.h>
 #include "mixer_hw.h"
 #include "earc.h"
diff --git a/sound/soc/amlogic/auge/pdm.c b/sound/soc/amlogic/auge/pdm.c
index 0d51a7b6a..d04b04222 100644
--- a/sound/soc/amlogic/auge/pdm.c
+++ b/sound/soc/amlogic/auge/pdm.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * PDM ALSA SoC Digital Audio Interface (DAI) driver
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/kernel.h>
diff --git a/sound/soc/amlogic/auge/pdm.h b/sound/soc/amlogic/auge/pdm.h
index e30ea78f2..7c6aacccc 100644
--- a/sound/soc/amlogic/auge/pdm.h
+++ b/sound/soc/amlogic/auge/pdm.h
@@ -1,4 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef __AML_PDM_H__
 #define __AML_PDM_H__
diff --git a/sound/soc/amlogic/auge/pdm_hw.c b/sound/soc/amlogic/auge/pdm_hw.c
index 0bce9c1e4..f2bcb3ba5 100644
--- a/sound/soc/amlogic/auge/pdm_hw.c
+++ b/sound/soc/amlogic/auge/pdm_hw.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * PDM register controls
- *
- * Copyright (C) 2019 Amlogic,inc
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/kernel.h>
diff --git a/sound/soc/amlogic/auge/pdm_hw_coeff.h b/sound/soc/amlogic/auge/pdm_hw_coeff.h
index 880afbe8f..6f5e1382e 100644
--- a/sound/soc/amlogic/auge/pdm_hw_coeff.h
+++ b/sound/soc/amlogic/auge/pdm_hw_coeff.h
@@ -1,10 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- * PDM hw coeff parameters
- *
- * Copyright (C) 2019 Amlogic,inc
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef __PDM_HW_COEFF_H__
diff --git a/sound/soc/amlogic/auge/pdm_match_table.h b/sound/soc/amlogic/auge/pdm_match_table.h
index c3fac0aef..8f0c1b5f7 100644
--- a/sound/soc/amlogic/auge/pdm_match_table.h
+++ b/sound/soc/amlogic/auge/pdm_match_table.h
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- * PDM match table
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef __PDM_MATCH_TABLE_H__
diff --git a/sound/soc/amlogic/auge/regs.h b/sound/soc/amlogic/auge/regs.h
index af6479e17..3c02e4a29 100644
--- a/sound/soc/amlogic/auge/regs.h
+++ b/sound/soc/amlogic/auge/regs.h
@@ -1,4 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef __AML_REGS_H_
 #define __AML_REGS_H_
diff --git a/sound/soc/amlogic/auge/resample.c b/sound/soc/amlogic/auge/resample.c
index 7ad5acd0d..930040772 100644
--- a/sound/soc/amlogic/auge/resample.c
+++ b/sound/soc/amlogic/auge/resample.c
@@ -1,7 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #define DEBUG
diff --git a/sound/soc/amlogic/auge/resample_hw.c b/sound/soc/amlogic/auge/resample_hw.c
index 8463c24de..af6ff7006 100644
--- a/sound/soc/amlogic/auge/resample_hw.c
+++ b/sound/soc/amlogic/auge/resample_hw.c
@@ -1,7 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/clk.h>
diff --git a/sound/soc/amlogic/auge/sharebuffer.c b/sound/soc/amlogic/auge/sharebuffer.c
index 377bc4467..3f5ac29c9 100644
--- a/sound/soc/amlogic/auge/sharebuffer.c
+++ b/sound/soc/amlogic/auge/sharebuffer.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * sharebuffer driver
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <sound/pcm.h>
diff --git a/sound/soc/amlogic/auge/spdif.c b/sound/soc/amlogic/auge/spdif.c
index db2fefe08..98bb096e2 100644
--- a/sound/soc/amlogic/auge/spdif.c
+++ b/sound/soc/amlogic/auge/spdif.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * S/PDIF ALSA SoC Digital Audio Interface (DAI) driver
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 //#define  DEBUG
diff --git a/sound/soc/amlogic/auge/spdif_hw.c b/sound/soc/amlogic/auge/spdif_hw.c
index 3cab9af9b..a3c721713 100644
--- a/sound/soc/amlogic/auge/spdif_hw.c
+++ b/sound/soc/amlogic/auge/spdif_hw.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * S/PDIF register controls
- *
- * Copyright (C) 2019 Amlogic,inc
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #define DEBUG
diff --git a/sound/soc/amlogic/auge/spdif_match_table.h b/sound/soc/amlogic/auge/spdif_match_table.h
index f33547154..c52bc15cd 100644
--- a/sound/soc/amlogic/auge/spdif_match_table.h
+++ b/sound/soc/amlogic/auge/spdif_match_table.h
@@ -1,9 +1,6 @@
 /* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- * S/PDIF match table
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #define SPDIF_A	0
diff --git a/sound/soc/amlogic/auge/tdm_hw.c b/sound/soc/amlogic/auge/tdm_hw.c
index 6b900e523..5fa3d64da 100644
--- a/sound/soc/amlogic/auge/tdm_hw.c
+++ b/sound/soc/amlogic/auge/tdm_hw.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * TDM register controls
- *
- * Copyright (C) 2019 Amlogic,inc
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <sound/soc.h>
diff --git a/sound/soc/amlogic/auge/tdm_hw.h b/sound/soc/amlogic/auge/tdm_hw.h
index 801addabb..83d04c7ed 100644
--- a/sound/soc/amlogic/auge/tdm_hw.h
+++ b/sound/soc/amlogic/auge/tdm_hw.h
@@ -1,4 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef __AML_TDM_HW_H__
 #define __AML_TDM_HW_H__
diff --git a/sound/soc/amlogic/auge/vad.c b/sound/soc/amlogic/auge/vad.c
index a80420c2d..2c0ed0c29 100644
--- a/sound/soc/amlogic/auge/vad.c
+++ b/sound/soc/amlogic/auge/vad.c
@@ -1,7 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 //#define DEBUG
diff --git a/sound/soc/amlogic/auge/vad_dev.c b/sound/soc/amlogic/auge/vad_dev.c
index c9cecada1..fbbe1c6b0 100644
--- a/sound/soc/amlogic/auge/vad_dev.c
+++ b/sound/soc/amlogic/auge/vad_dev.c
@@ -1,7 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 //#define DEBUG
diff --git a/sound/soc/amlogic/auge/vad_hw.c b/sound/soc/amlogic/auge/vad_hw.c
index 40a014768..980ab3128 100644
--- a/sound/soc/amlogic/auge/vad_hw.c
+++ b/sound/soc/amlogic/auge/vad_hw.c
@@ -1,7 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include "vad_hw.h"
diff --git a/sound/soc/amlogic/auge/vad_hw.h b/sound/soc/amlogic/auge/vad_hw.h
index 58db5c7f1..7cc328efb 100644
--- a/sound/soc/amlogic/auge/vad_hw.h
+++ b/sound/soc/amlogic/auge/vad_hw.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
  * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
- *
  */
 
 #ifndef __VAD_HW_H__
diff --git a/sound/soc/amlogic/common/debug.h b/sound/soc/amlogic/common/debug.h
index 5653d9482..f33f723bd 100644
--- a/sound/soc/amlogic/common/debug.h
+++ b/sound/soc/amlogic/common/debug.h
@@ -1,7 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #ifndef __AML_AUDIO_DEBUG_H_
diff --git a/sound/soc/amlogic/common/iomapres.c b/sound/soc/amlogic/common/iomapres.c
index 00b8ab528..1388715c2 100644
--- a/sound/soc/amlogic/common/iomapres.c
+++ b/sound/soc/amlogic/common/iomapres.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * iomapres driver
- *
- * Copyright (C) 2019 Amlogic, Inc. All rights reserved.
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/of.h>
diff --git a/sound/soc/amlogic/common/iomapres.h b/sound/soc/amlogic/common/iomapres.h
index c649ab657..e61c4635a 100644
--- a/sound/soc/amlogic/common/iomapres.h
+++ b/sound/soc/amlogic/common/iomapres.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
  * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
- *
  */
 
 #ifndef __IOMAPRES_H__
diff --git a/sound/soc/amlogic/common/misc.c b/sound/soc/amlogic/common/misc.c
index 5eb82ae32..b6c39f16c 100644
--- a/sound/soc/amlogic/common/misc.c
+++ b/sound/soc/amlogic/common/misc.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * misc function interface
- *
- * Copyright (C) 2019 Amlogic,inc
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <sound/asoundef.h>
diff --git a/sound/soc/amlogic/common/misc.h b/sound/soc/amlogic/common/misc.h
index 06a01ba29..0d85dc156 100644
--- a/sound/soc/amlogic/common/misc.h
+++ b/sound/soc/amlogic/common/misc.h
@@ -1,4 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef __MISC_H__
 #define __MISC_H__
diff --git a/sound/soc/codecs/amlogic/ad82088d_eq/ad82088d_eq_mode_1.h b/sound/soc/codecs/amlogic/ad82088d_eq/ad82088d_eq_mode_1.h
index dc598ef8d..4410d8886 100644
--- a/sound/soc/codecs/amlogic/ad82088d_eq/ad82088d_eq_mode_1.h
+++ b/sound/soc/codecs/amlogic/ad82088d_eq/ad82088d_eq_mode_1.h
@@ -1,12 +1,8 @@
 /* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
-//#####################################################
-//#WriteBy: ESMT
-//#Product: AD82088D_GUI_v1.0
-//#Date:2021/10/26
-//#####################################################
-
-//Register_Table {Register Address, Register Data}
 #ifdef AD82088D_CHANGE_EQ_MODE_EN
 static unsigned char eq_mode_1_reg_tab[AD82088D_REGISTER_COUNT][2] = {
 		{0x00, 0x04},//##AGC_ALPHA
diff --git a/sound/soc/codecs/amlogic/ad82088d_eq/ad82088d_eq_mode_2.h b/sound/soc/codecs/amlogic/ad82088d_eq/ad82088d_eq_mode_2.h
index f9b7264dc..2b9dcf393 100644
--- a/sound/soc/codecs/amlogic/ad82088d_eq/ad82088d_eq_mode_2.h
+++ b/sound/soc/codecs/amlogic/ad82088d_eq/ad82088d_eq_mode_2.h
@@ -1,12 +1,8 @@
 /* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
-//#####################################################
-//#WriteBy: ESMT
-//#Product: AD82088D_GUI_v1.0
-//#Date:2021/10/26
-//#####################################################
-
-//Register_Table {Register Address, Register Data}
 #ifdef AD82088D_CHANGE_EQ_MODE_EN
 static unsigned char eq_mode_2_reg_tab[AD82088D_REGISTER_COUNT][2] = {
 		{0x00, 0x04},//##AGC_ALPHA
diff --git a/sound/soc/codecs/amlogic/ad82584f.c b/sound/soc/codecs/amlogic/ad82584f.c
index e9e2675bb..e7179c514 100644
--- a/sound/soc/codecs/amlogic/ad82584f.c
+++ b/sound/soc/codecs/amlogic/ad82584f.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * ALSA SoC ad82584f codec driver
- *
- * Copyright (C) 2019 Amlogic,inc
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/module.h>
diff --git a/sound/soc/codecs/amlogic/ad82584f.h b/sound/soc/codecs/amlogic/ad82584f.h
index 27e6b6217..8366884bb 100644
--- a/sound/soc/codecs/amlogic/ad82584f.h
+++ b/sound/soc/codecs/amlogic/ad82584f.h
@@ -1,4 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef _AD82584F_H
 #define _AD82584F_H
diff --git a/sound/soc/codecs/amlogic/aml_codec_t9015.c b/sound/soc/codecs/amlogic/aml_codec_t9015.c
index 0b2368c05..8b7eb5cae 100644
--- a/sound/soc/codecs/amlogic/aml_codec_t9015.c
+++ b/sound/soc/codecs/amlogic/aml_codec_t9015.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * ALSA SoC Amlogic t9015c internel codec driver
- *
- * Copyright (C) 2019 Amlogic,inc
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/module.h>
diff --git a/sound/soc/codecs/amlogic/aml_codec_t9015.h b/sound/soc/codecs/amlogic/aml_codec_t9015.h
index ca4cc3e3d..528beebf8 100644
--- a/sound/soc/codecs/amlogic/aml_codec_t9015.h
+++ b/sound/soc/codecs/amlogic/aml_codec_t9015.h
@@ -1,4 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef AML_T9015_H_
 #define AML_T9015_H_
diff --git a/sound/soc/codecs/amlogic/dummy_codec.c b/sound/soc/codecs/amlogic/dummy_codec.c
index a949e3470..0be3f5b5c 100644
--- a/sound/soc/codecs/amlogic/dummy_codec.c
+++ b/sound/soc/codecs/amlogic/dummy_codec.c
@@ -1,9 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * ALSA SoC dummy codec driver
- *
- * Copyright (C) 2019 Amlogic,inc
- *
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/module.h>
diff --git a/sound/soc/codecs/amlogic/ntp8918.c b/sound/soc/codecs/amlogic/ntp8918.c
index 5f13d7b1b..204cf9e9e 100644
--- a/sound/soc/codecs/amlogic/ntp8918.c
+++ b/sound/soc/codecs/amlogic/ntp8918.c
@@ -1,4 +1,8 @@
-// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
diff --git a/sound/soc/codecs/amlogic/tlv320adc3101.c b/sound/soc/codecs/amlogic/tlv320adc3101.c
index 9bbc51c50..8ddca0fb2 100644
--- a/sound/soc/codecs/amlogic/tlv320adc3101.c
+++ b/sound/soc/codecs/amlogic/tlv320adc3101.c
@@ -1,11 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * ALSA SoC tlv320adc3101 codec driver
- *
- * Copyright (C) 2019 Amlogic,inc
- *
- * Based on sound/soc/codecs/tlv320aic320x and
- * TI driver for kernel 2.6.27.
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
  */
 
 #include <linux/module.h>
diff --git a/sound/soc/codecs/amlogic/tlv320adc3101.h b/sound/soc/codecs/amlogic/tlv320adc3101.h
index 467750730..39434a8f0 100644
--- a/sound/soc/codecs/amlogic/tlv320adc3101.h
+++ b/sound/soc/codecs/amlogic/tlv320adc3101.h
@@ -1,4 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2019 Amlogic, Inc. All rights reserved.
+ */
 
 #ifndef _TLV320ADC3101_H
 #define _TLV320ADC3101_H