diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index 59ae3b7f2ac7..984ad6416904 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -219,6 +219,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-odroid-m1-android.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-odroid-m1s.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-odroid-m1s-android.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-odroid-m2.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-odroid-m2-android.dtb
 
 subdir-$(CONFIG_ARCH_ROCKCHIP_ODROIDM1) += overlays/odroidm1
 subdir-$(CONFIG_ARCH_ROCKCHIP_ODROIDM1) += overlays/odroidm1s
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2-android.dts b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2-android.dts
new file mode 100644
index 000000000000..5981c4f1f8a9
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2-android.dts
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2024 Hardkernel Co., Ltd.
+ *
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pwm/pwm.h>
+#include <dt-bindings/pinctrl/rockchip.h>
+#include <dt-bindings/display/drm_mipi_dsi.h>
+#include <dt-bindings/display/rockchip_vop.h>
+#include <dt-bindings/sensor-dev.h>
+#include <dt-bindings/usb/pd.h>
+
+#include "rk3588s-odroid-m2-power.dtsi"
+#include "rk3588s-odroid-m2.dtsi"
+#include "rk3588-android.dtsi"
+
+/ {
+	model = "Hardkernel ODROID-M2";
+	compatible = "hardkernel,odroid-m2", "rockchip,rk3588";
+};
+
+&chosen {
+	/delete-property/ bootargs;
+};
diff --git a/arch/arm64/configs/odroidm2.config b/arch/arm64/configs/odroidm2.config
new file mode 100644
index 000000000000..d8b3e78d8489
--- /dev/null
+++ b/arch/arm64/configs/odroidm2.config
@@ -0,0 +1,20 @@
+# CONFIG_RK_SFC_NAND is not set
+# CONFIG_ROCKCHIP_MTD_VENDOR_STORAGE is not set
+# CONFIG_ROCKCHIP_SCHED_PERFORMANCE_BIAS is not set
+# CONFIG_ROCKCHIP_VENDOR_STORAGE_UPDATE_LOADER is not set
+CONFIG_ARCH_ROCKCHIP_ODROIDM2=y
+CONFIG_CAN=y
+CONFIG_CAN_MCP251X=y
+# CONFIG_DEVMEM is not set
+CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
+CONFIG_KEYBOARD_GPIO_POLLED=y
+CONFIG_RTC_DRV_PCF8563=y
+CONFIG_TOUCHSCREEN_DWAV_USB_MT=y
+CONFIG_TOUCHSCREEN_GOODIX=y
+CONFIG_USB_SERIAL_CH341=y
+CONFIG_USB_SERIAL_CP210X=y
+CONFIG_USB_SERIAL_FTDI_SIO=y
+CONFIG_USB_SERIAL_PL2303=y
+CONFIG_NET_SOCK_MSG=y
+CONFIG_NET_DEVLINK=y
+CONFIG_REALTEK_PHY=y