diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index 7b35763d7c36..fa27926f0519 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -5,8 +5,8 @@ dtb-y += g12a_s905d2_u200_buildroot.dtb
 dtb-y += g12a_s905d2_u200_drm_buildroot.dtb
 dtb-y += g12b_a311d_w400.dtb
 dtb-y += g12b_a311d_w400_buildroot.dtb
-dtb-$(CONFIG_ARCH_MESON64_ODROIDC3) += s905d2_odroidc3.dtb
-dtb-$(CONFIG_ARCH_MESON64_ODROIDC3) += s905d2_odroidc3_android.dtb
-dtb-$(CONFIG_ARCH_MESON64_ODROIDN2) += s922d_odroidn2.dtb
-dtb-$(CONFIG_ARCH_MESON64_ODROIDN2) += s922d_odroidn2_android.dtb
-dtb-$(CONFIG_ARCH_MESON64_ODROIDN2) += s922d_odroidn2_spibios.dtb
+dtb-$(CONFIG_ARCH_MESON64_ODROIDC3) += meson64_odroidc3.dtb
+dtb-$(CONFIG_ARCH_MESON64_ODROIDC3) += meson64_odroidc3_android.dtb
+dtb-$(CONFIG_ARCH_MESON64_ODROIDN2) += meson64_odroidn2.dtb
+dtb-$(CONFIG_ARCH_MESON64_ODROIDN2) += meson64_odroidn2_android.dtb
+dtb-$(CONFIG_ARCH_MESON64_ODROIDN2) += meson64_odroidn2_spibios.dtb
diff --git a/arch/arm64/boot/dts/amlogic/s905d2_odroidc3.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc3.dts
similarity index 99%
rename from arch/arm64/boot/dts/amlogic/s905d2_odroidc3.dts
rename to arch/arm64/boot/dts/amlogic/meson64_odroidc3.dts
index 00260f08538f..cb6a7e34276f 100644
--- a/arch/arm64/boot/dts/amlogic/s905d2_odroidc3.dts
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidc3.dts
@@ -1,5 +1,5 @@
 /*
- * arch/arm64/boot/dts/amlogic/s905d2_odroidc3.dts
+ * arch/arm64/boot/dts/amlogic/meson64_odroidc3.dts
  *
  * Copyright (C) 2018 Hardkernel Co., Ltd. All rights reserved.
  *
diff --git a/arch/arm64/boot/dts/amlogic/s905d2_odroidc3_android.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc3_android.dts
similarity index 95%
rename from arch/arm64/boot/dts/amlogic/s905d2_odroidc3_android.dts
rename to arch/arm64/boot/dts/amlogic/meson64_odroidc3_android.dts
index b81dd7bdff88..1be53aa9fd87 100644
--- a/arch/arm64/boot/dts/amlogic/s905d2_odroidc3_android.dts
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidc3_android.dts
@@ -1,5 +1,5 @@
 /*
- * arch/arm64/boot/dts/amlogic/s905d2_odroidc3_android.dts
+ * arch/arm64/boot/dts/amlogic/meson64_odroidc3_android.dts
  *
  * Copyright (C) 2018 Hardkernel Co., Ltd. All rights reserved.
  *
@@ -15,7 +15,7 @@
  *
  */
 
-#include "s905d2_odroidc3.dts"
+#include "meson64_odroidc3.dts"
 
 / {
 	firmware {
diff --git a/arch/arm64/boot/dts/amlogic/s922d_odroidn2.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts
similarity index 99%
rename from arch/arm64/boot/dts/amlogic/s922d_odroidn2.dts
rename to arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts
index 6ed5c7106f85..7308979acc78 100644
--- a/arch/arm64/boot/dts/amlogic/s922d_odroidn2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts
@@ -1,5 +1,5 @@
 /*
- * arch/arm64/boot/dts/amlogic/s922d_odroidn2.dts
+ * arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts
  *
  * Copyright (C) 2018 Hardkernel Co,. Ltd. All rights reserved.
  *
diff --git a/arch/arm64/boot/dts/amlogic/s922d_odroidn2_android.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidn2_android.dts
similarity index 95%
rename from arch/arm64/boot/dts/amlogic/s922d_odroidn2_android.dts
rename to arch/arm64/boot/dts/amlogic/meson64_odroidn2_android.dts
index d718a8ce4905..74b5c1b77d54 100644
--- a/arch/arm64/boot/dts/amlogic/s922d_odroidn2_android.dts
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidn2_android.dts
@@ -1,5 +1,5 @@
 /*
- * arch/arm64/boot/dts/amlogic/s905d2_odroidc3_android.dts
+ * arch/arm64/boot/dts/amlogic/meson64_odroidc3_android.dts
  *
  * Copyright (C) 2018 Hardkernel Co., Ltd. All rights reserved.
  *
@@ -15,7 +15,7 @@
  *
  */
 
-#include "s922d_odroidn2.dts"
+#include "meson64_odroidn2.dts"
 
 / {
 	firmware {
diff --git a/arch/arm64/boot/dts/amlogic/s922d_odroidn2_spibios.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidn2_spibios.dts
similarity index 99%
rename from arch/arm64/boot/dts/amlogic/s922d_odroidn2_spibios.dts
rename to arch/arm64/boot/dts/amlogic/meson64_odroidn2_spibios.dts
index 09d0a0dc1cd4..ff407a891e0d 100644
--- a/arch/arm64/boot/dts/amlogic/s922d_odroidn2_spibios.dts
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidn2_spibios.dts
@@ -1,5 +1,5 @@
 /*
- * arch/arm64/boot/dts/amlogic/s922d_odroidn2.dts
+ * arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts
  *
  * Copyright (C) 2018 Hardkernel Co,. Ltd. All rights reserved.
  *