diff --git a/plat/imx/common/imx8m/imx_rdc.c b/plat/imx/common/imx8m/imx_rdc.c
index 35c5362..1a21cd3 100644
--- a/plat/imx/common/imx8m/imx_rdc.c
+++ b/plat/imx/common/imx8m/imx_rdc.c
@@ -160,17 +160,17 @@
 #else
 /* Default peripherals settings as an example */
 static struct rdc_pdap_conf periph_config[] = {
-	{RDC_PDAP_GPU_EXSC, 0x0C, 0},
-	{RDC_PDAP_VPU_SEC, 0x33, 0},
+	{RDC_PDAP_GPIO1, 0x3, 0},
+	{RDC_PDAP_GPIO2, 0x3, 0},
+	{RDC_PDAP_GPIO3, 0x3, 0},
+	{RDC_PDAP_GPIO4, 0x3, 0},
+	{RDC_PDAP_GPIO5, 0x3, 0},
 };
 
 /* Default masters settings as an example */
 static struct rdc_mda_conf masters_config[] = {
-	{RDC_MDA_A53, 0, 1},
-	{RDC_MDA_CAAM, 0, 1},
-	{RDC_MDA_GPU, 1, 1},
-	{RDC_MDA_VPU_DEC, 2, 1},
-	{RDC_MDA_DCSS, 3, 1},
+	{RDC_MDA_A53, 0, 0},
+	{RDC_MDA_CAAM, 0, 0},
 };
 #endif
 void imx_rdc_set_peripherals_default(void)
diff --git a/plat/imx/imx8mm/imx8mm_bl31_setup.c b/plat/imx/imx8mm/imx8mm_bl31_setup.c
index 0d18530..1fc7faf 100644
--- a/plat/imx/imx8mm/imx8mm_bl31_setup.c
+++ b/plat/imx/imx8mm/imx8mm_bl31_setup.c
@@ -68,6 +68,13 @@
 
 #if !defined(DECRYPTED_BUFFER_END) && !defined(DECODED_BUFFER_END)
 #define RDC_DISABLED
+#else
+static struct rdc_mda_conf masters_config[] = {
+	{RDC_MDA_A53, 0, 1},
+	{RDC_MDA_GPU, 1, 1},
+	{RDC_MDA_VPU_DEC, 2, 1},
+	{RDC_MDA_CAAM, 3, 1},
+};
 #endif
 
 /* set RDC settings */
@@ -79,7 +86,7 @@
 	struct imx_rdc_regs *imx_rdc = (struct imx_rdc_regs *)IMX_RDC_BASE;
 
 	NOTICE("RDC imx_rdc_set_masters default \n");
-	imx_rdc_set_masters_default();
+	imx_rdc_set_masters(masters_config, ARRAY_SIZE(masters_config));
 
 	/*
 	 * Need to substact offset 0x40000000 from CPU address when
diff --git a/plat/imx/imx8mq/imx8mq_bl31_setup.c b/plat/imx/imx8mq/imx8mq_bl31_setup.c
index 0414760..3fccf28 100644
--- a/plat/imx/imx8mq/imx8mq_bl31_setup.c
+++ b/plat/imx/imx8mq/imx8mq_bl31_setup.c
@@ -97,8 +97,17 @@
 
 #if !defined(DECRYPTED_BUFFER_END) && !defined(DECODED_BUFFER_END)
 #define RDC_DISABLED
+#else
+static struct rdc_mda_conf masters_config[] = {
+	{RDC_MDA_A53, 0, 1},
+	{RDC_MDA_CAAM, 0, 1},
+	{RDC_MDA_GPU, 1, 1},
+	{RDC_MDA_VPU_DEC, 2, 1},
+	{RDC_MDA_DCSS, 3, 1},
+};
 #endif
 
+
 /* set RDC settings */
 static void bl31_imx_rdc_setup(void)
 {
@@ -108,7 +117,7 @@
 	struct imx_rdc_regs *imx_rdc = (struct imx_rdc_regs *)IMX_RDC_BASE;
 
 	NOTICE("RDC imx_rdc_set_masters default \n");
-	imx_rdc_set_masters_default();
+	imx_rdc_set_masters(masters_config, ARRAY_SIZE(masters_config));
 
 	/*
 	 * Need to substact offset 0x40000000 from CPU address when