--- a/v1.0/src/nss_crypto_dtsi.c
+++ b/v1.0/src/nss_crypto_dtsi.c
@@ -310,11 +310,11 @@ static int nss_crypto_probe(struct platf
 	e_ctrl->dev = &pdev->dev;
 
 	e_ctrl->cmd_base = crypto_res.start;
-	e_ctrl->crypto_base = ioremap_nocache(e_ctrl->cmd_base, resource_size(&crypto_res));
+	e_ctrl->crypto_base = ioremap(e_ctrl->cmd_base, resource_size(&crypto_res));
 	nss_crypto_assert(e_ctrl->crypto_base);
 
 	e_ctrl->bam_pbase = bam_res.start;
-	e_ctrl->bam_base = ioremap_nocache(e_ctrl->bam_pbase, resource_size(&bam_res));
+	e_ctrl->bam_base = ioremap(e_ctrl->bam_pbase, resource_size(&bam_res));
 	nss_crypto_assert(e_ctrl->bam_base);
 
 	e_ctrl->bam_ee = bam_ee;
--- a/v1.0/src/nss_crypto_platform.c
+++ b/v1.0/src/nss_crypto_platform.c
@@ -134,11 +134,11 @@ static int nss_crypto_probe(struct platf
 	e_ctrl->bam_ee = res->bam_ee;
 
 	e_ctrl->cmd_base = res->crypto_pbase;
-	e_ctrl->crypto_base = ioremap_nocache(res->crypto_pbase, res->crypto_pbase_sz);
+	e_ctrl->crypto_base = ioremap(res->crypto_pbase, res->crypto_pbase_sz);
 	nss_crypto_assert(e_ctrl->crypto_base);
 
 	e_ctrl->bam_pbase = res->bam_pbase;
-	e_ctrl->bam_base = ioremap_nocache(res->bam_pbase, res->bam_pbase_sz);
+	e_ctrl->bam_base = ioremap(res->bam_pbase, res->bam_pbase_sz);
 	nss_crypto_assert(e_ctrl->bam_base);
 
 	/*
--- a/v2.0/src/hal/ipq60xx/nss_crypto_eip197.c
+++ b/v2.0/src/hal/ipq60xx/nss_crypto_eip197.c
@@ -413,7 +413,7 @@ int nss_crypto_eip197_engine_init(struct
 	 * remap the I/O addresses
 	 */
 	paddr = res->start + offset;
-	vaddr = ioremap_nocache(paddr, resource_size(res));
+	vaddr = ioremap(paddr, resource_size(res));
 	if (!vaddr) {
 		nss_crypto_warn("%p: unable to remap crypto_addr(0x%p)\n", node, (void *)paddr);
 		return -EIO;
--- a/v2.0/src/hal/ipq807x/nss_crypto_eip197.c
+++ b/v2.0/src/hal/ipq807x/nss_crypto_eip197.c
@@ -414,7 +414,7 @@ int nss_crypto_eip197_engine_init(struct
 	 * remap the I/O addresses
 	 */
 	paddr = res->start + offset;
-	vaddr = ioremap_nocache(paddr, resource_size(res));
+	vaddr = ioremap(paddr, resource_size(res));
 	if (!vaddr) {
 		nss_crypto_warn("%p: unable to remap crypto_addr(0x%p)\n", node, (void *)paddr);
 		return -EIO;