diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 0e0baa944c2c..5d22c575b295 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -1720,7 +1720,7 @@ static int rk_iommu_of_xlate(struct device *dev,
 	return 0;
 }
 
-void rk_iommu_mask_irq(struct device *dev)
+void rockchip_iommu_mask_irq(struct device *dev)
 {
 	struct rk_iommu *iommu = rk_iommu_from_dev(dev);
 	int i;
@@ -1731,9 +1731,9 @@ void rk_iommu_mask_irq(struct device *dev)
 	for (i = 0; i < iommu->num_mmu; i++)
 		rk_iommu_write(iommu->bases[i], RK_MMU_INT_MASK, 0);
 }
-EXPORT_SYMBOL(rk_iommu_mask_irq);
+EXPORT_SYMBOL(rockchip_iommu_mask_irq);
 
-void rk_iommu_unmask_irq(struct device *dev)
+void rockchip_iommu_unmask_irq(struct device *dev)
 {
 	struct rk_iommu *iommu = rk_iommu_from_dev(dev);
 	int i;
@@ -1749,7 +1749,7 @@ void rk_iommu_unmask_irq(struct device *dev)
 		rk_iommu_base_command(iommu->bases[i], RK_MMU_CMD_PAGE_FAULT_DONE);
 	}
 }
-EXPORT_SYMBOL(rk_iommu_unmask_irq);
+EXPORT_SYMBOL(rockchip_iommu_unmask_irq);
 
 static struct iommu_ops rk_iommu_ops = {
 	.domain_alloc = rk_iommu_domain_alloc,
diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2_link.c b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.c
index f7418621c683..b62bc01589f5 100644
--- a/drivers/video/rockchip/mpp/mpp_rkvdec2_link.c
+++ b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.c
@@ -1797,7 +1797,7 @@ int rkvdec2_ccu_iommu_fault_handle(struct iommu_domain *iommu,
 
 	atomic_inc(&mpp->queue->reset_request);
 	for (i = 0; i < mpp->queue->core_count; i++)
-		rk_iommu_mask_irq(mpp->queue->cores[i]->dev);
+		rockchip_iommu_mask_irq(mpp->queue->cores[i]->dev);
 
 	kthread_queue_work(&mpp->queue->worker, &mpp->work);
 
diff --git a/drivers/video/rockchip/mpp/mpp_rkvenc.c b/drivers/video/rockchip/mpp/mpp_rkvenc.c
index ce6b42186452..36a888193246 100644
--- a/drivers/video/rockchip/mpp/mpp_rkvenc.c
+++ b/drivers/video/rockchip/mpp/mpp_rkvenc.c
@@ -1144,7 +1144,7 @@ static void rkvenc_iommu_handle_work(struct work_struct *work_s)
 	else
 		enc->aux_iova = page_iova;
 
-	rk_iommu_unmask_irq(mpp->dev);
+	rockchip_iommu_unmask_irq(mpp->dev);
 	mpp_iommu_up_write(mpp->iommu_info);
 
 	mpp_debug_leave();
@@ -1161,7 +1161,7 @@ static int rkvenc_iommu_fault_handle(struct iommu_domain *iommu,
 	mpp_debug(DEBUG_IOMMU, "IOMMU_GET_BUS_ID(status)=%d\n", IOMMU_GET_BUS_ID(status));
 	if (IOMMU_GET_BUS_ID(status)) {
 		enc->fault_iova = iova;
-		rk_iommu_mask_irq(mpp->dev);
+		rockchip_iommu_mask_irq(mpp->dev);
 		queue_work(enc->iommu_wq, &enc->iommu_work);
 	}
 	mpp_debug_leave();
diff --git a/include/soc/rockchip/rockchip_iommu.h b/include/soc/rockchip/rockchip_iommu.h
index e4e9d41ab99c..10a5d62ae35d 100644
--- a/include/soc/rockchip/rockchip_iommu.h
+++ b/include/soc/rockchip/rockchip_iommu.h
@@ -13,8 +13,8 @@ int rockchip_iommu_disable(struct device *dev);
 int rockchip_pagefault_done(struct device *master_dev);
 void __iomem *rockchip_get_iommu_base(struct device *master_dev, int idx);
 bool rockchip_iommu_is_enabled(struct device *dev);
-void rk_iommu_mask_irq(struct device *dev);
-void rk_iommu_unmask_irq(struct device *dev);
+void rockchip_iommu_mask_irq(struct device *dev);
+void rockchip_iommu_unmask_irq(struct device *dev);
 #else
 static inline int rockchip_iommu_enable(struct device *dev)
 {
@@ -36,10 +36,10 @@ static inline bool rockchip_iommu_is_enabled(struct device *dev)
 {
 	return false;
 }
-static inline void rk_iommu_mask_irq(struct device *dev)
+static inline void rockchip_iommu_mask_irq(struct device *dev)
 {
 }
-static inline void rk_iommu_unmask_irq(struct device *dev)
+static inline void rockchip_iommu_unmask_irq(struct device *dev)
 {
 }
 #endif