diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index 3cb8fa0a1ff3..69076635229d 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -119,6 +119,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3562-evb2-ddr4-v10.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3562-evb2-ddr4-v10-dual-camera.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3562-evb2-ddr4-v10-image-reverse.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3562-evb2-ddr4-v10-linux.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3562-evb2-ddr4-v10-linux-amp.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3562-evb2-ddr4-v10-pdm-mic-array.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3562-evb2-ddr4-v10-sii9022-bt1120-to-hdmi.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3562-iotest-lp3-v10.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3562-evb2-ddr4-v10-linux-amp.dts b/arch/arm64/boot/dts/rockchip/rk3562-evb2-ddr4-v10-linux-amp.dts
new file mode 100644
index 000000000000..99385760cbed
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3562-evb2-ddr4-v10-linux-amp.dts
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2023 Rockchip Electronics Co., Ltd.
+ *
+ */
+
+#include "rk3562-evb2-ddr4-v10.dtsi"
+#include "rk3562-linux.dtsi"
+#include "rk3562-rk809.dtsi"
+#include "rk3562-evb2-cam.dtsi"
+#include "rk3562-amp.dtsi"
+
+/ {
+	memory {
+		device_type = "memory";
+		reg = <0x0 0x02000000 0x0 0x04b80000>,
+		      <0x0 0x0a200000 0x0 0x75e00000>;
+	};
+};
+
+&arm_pmu {
+	interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>;
+};
+
+/delete-node/ &cpu3;
+
+&sdmmc0 {
+	status = "disabled";
+};
diff --git a/drivers/rknpu/rknpu_drv.c b/drivers/rknpu/rknpu_drv.c
index 867212ce6059..40214b4eb7dc 100644
--- a/drivers/rknpu/rknpu_drv.c
+++ b/drivers/rknpu/rknpu_drv.c
@@ -1633,12 +1633,9 @@ static int rknpu_register_irq(struct platform_device *pdev,
 {
 	const struct rknpu_config *config = rknpu_dev->config;
 	struct device *dev = &pdev->dev;
-#if KERNEL_VERSION(6, 1, 0) > LINUX_VERSION_CODE
 	struct resource *res;
-#endif
 	int i, ret, irq;
 
-#if KERNEL_VERSION(6, 1, 0) > LINUX_VERSION_CODE
 	res = platform_get_resource_byname(pdev, IORESOURCE_IRQ,
 					   config->irqs[0].name);
 	if (res) {
@@ -1677,25 +1674,6 @@ static int rknpu_register_irq(struct platform_device *pdev,
 			return ret;
 		}
 	}
-#else
-	/* there are irq names in dts */
-	for (i = 0; i < config->num_irqs; i++) {
-		irq = platform_get_irq_byname(pdev, config->irqs[i].name);
-		if (irq < 0) {
-			LOG_DEV_ERROR(dev, "no npu %s in dts\n",
-				      config->irqs[i].name);
-			return irq;
-		}
-
-		ret = devm_request_irq(dev, irq, config->irqs[i].irq_hdl,
-				       IRQF_SHARED, dev_name(dev), rknpu_dev);
-		if (ret < 0) {
-			LOG_DEV_ERROR(dev, "request %s failed: %d\n",
-				      config->irqs[i].name, ret);
-			return ret;
-		}
-	}
-#endif
 
 	return 0;
 }
diff --git a/sound/soc/rockchip/rockchip_utils.c b/sound/soc/rockchip/rockchip_utils.c
index c8cbd71537d1..b26c33849f8b 100644
--- a/sound/soc/rockchip/rockchip_utils.c
+++ b/sound/soc/rockchip/rockchip_utils.c
@@ -12,6 +12,7 @@
 #include <soc/rockchip/rockchip-system-status.h>
 #include <sound/pcm_params.h>
 #include <sound/dmaengine_pcm.h>
+#include "rockchip_utils.h"
 
 #define DMC_STALL_TIME_US_DEFAULT	100
 #define TIME_MARGIN_US			20