diff --git a/MAINTAINERS b/MAINTAINERS
index 41ef8b86eeb4..6270a2a70fb3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13552,10 +13552,10 @@ F: arch/arm/include/asm/kasan.h
 F: arch/arm/mm/kasan_init.c
 
 HDMITX OUTPUT DRIVER
-M:      Zongdong Jiao <zongdong.jiao@amlogic.com>
+M:  Zongdong Jiao <zongdong.jiao@amlogic.com>
 M:	Zhengrong Zhu <zhengrong.zhu@amlogic.com>
 S:	Maintained
-F:	drivers/amlogic/media/vout/hdmitx/*
+F:	drivers/amlogic/media/vout/hdmitx/
 F:	drivers/amlogic/media/vout/hdmitx/hdcp/*
 F:	include/linux/amlogic/media/vout/hdmi_tx/*
 F:	drivers/amlogic/esm/*
@@ -15246,4 +15246,3 @@ F: include/linux/amlogic/media/video_sink/v4lvideo_ext.h
 AMLOGIC POWER DOMAIN DRIVER
 M:	Zhiqiang Liang <zhiqiang.liang@amlogic.com>
 F: 	drivers/amlogic/power/power_domain.c
-
diff --git a/arch/arm/boot/dts/amlogic/mesonsm1.dtsi b/arch/arm/boot/dts/amlogic/mesonsm1.dtsi
index a91fb5b8dc52..b8062badf2b6 100644
--- a/arch/arm/boot/dts/amlogic/mesonsm1.dtsi
+++ b/arch/arm/boot/dts/amlogic/mesonsm1.dtsi
@@ -487,10 +487,15 @@
 		reg = <0xff809000 0x48>;
 	};
 
-	power_ctrl: power_ctrl@ff8000e8 {
-		compatible = "amlogic, sm1-powerctrl";
-		reg = <0xff8000e8 0x10>,
-		      <0xff63c100 0x10>;
+	pwrdm: power-domains {
+		compatible = "amlogic,sm1-power-domain";
+		reg = <0xff62fc00 0xf0>,
+		      <0xff8000e8 0x10>,
+		      <0xff63c100 0x40>,
+		      <0xffd01080 0x20>;
+		vpu_mempd_reg3 = <0xc>;
+		vpu_mempd_reg4 = <0x10>;
+		status = "okay";
 	};
 
 	bl40: bl40 {
diff --git a/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi b/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
index a7b23f6259f9..5d2fdf814c77 100644
--- a/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
@@ -487,10 +487,15 @@
 		reg = <0x0 0xff809000 0x0 0x48>;
 	};
 
-	power_ctrl: power_ctrl@ff8000e8 {
-		compatible = "amlogic, sm1-powerctrl";
-		reg = <0x0 0xff8000e8 0x0 0x10>,
-		      <0x0 0xff63c100 0x0 0x10>;
+	pwrdm: power-domains {
+		compatible = "amlogic,sm1-power-domain";
+		reg = <0x0 0xff62fc00 0x0 0xf0>,
+		      <0x0 0xff8000e8 0x0 0x10>,
+		      <0x0 0xff63c100 0x0 0x40>,
+		      <0x0 0xffd01080 0x0 0x20>;
+		vpu_mempd_reg3 = <0xc>;
+		vpu_mempd_reg4 = <0x10>;
+		status = "okay";
 	};
 
 	bl40: bl40 {
diff --git a/drivers/amlogic/media/common/ge2d/ge2d_wq.c b/drivers/amlogic/media/common/ge2d/ge2d_wq.c
index 155876c676c6..a8eaf2b60a89 100644
--- a/drivers/amlogic/media/common/ge2d/ge2d_wq.c
+++ b/drivers/amlogic/media/common/ge2d/ge2d_wq.c
@@ -479,11 +479,6 @@ static int ge2d_process_work_queue(struct ge2d_context_s *wq)
 		pos = pos->next;
 		list_move_tail(&pitem->list, &wq->free_queue);
 		spin_unlock(&wq->lock);
-		/* if block mode (cmd) */
-		if (block_mode) {
-			pitem->cmd.wait_done_flag = 0;
-			wake_up_interruptible(&wq->cmd_complete);
-		}
 		/* if dma buf detach it */
 		for (i = 0; i < MAX_PLANE; i++) {
 			if (pitem->config.src_dma_cfg[i].dma_used) {
@@ -505,6 +500,11 @@ static int ge2d_process_work_queue(struct ge2d_context_s *wq)
 				kfree(pitem->config.dst_dma_cfg[i].dma_cfg);
 			}
 		}
+		/* if block mode (cmd) */
+		if (block_mode) {
+			pitem->cmd.wait_done_flag = 0;
+			wake_up_interruptible(&wq->cmd_complete);
+		}
 		pitem = (struct ge2d_queue_item_s *)pos;
 	} while (pos != head);
 	ge2d_manager.last_wq = wq;
diff --git a/drivers/amlogic/power/Makefile b/drivers/amlogic/power/Makefile
index 518b1d6b974f..a7637e80c531 100644
--- a/drivers/amlogic/power/Makefile
+++ b/drivers/amlogic/power/Makefile
@@ -4,4 +4,4 @@ obj-$(CONFIG_AMLOGIC_PMU_OF)                += aml_pmu_of_common.o
 
 obj-$(CONFIG_AMLOGIC_M8B_DVFS)              += aml_dvfs/
 obj-$(CONFIG_AMLOGIC_POWER)                 += power_ctrl.o
-#obj-$(CONFIG_AMLOGIC_POWER)                 += power_domain.o
+obj-$(CONFIG_AMLOGIC_POWER)                 += power_domain.o