diff options
| author | Olivier Masse <olivier.masse@nxp.com> | 2018-10-05 11:03:18 +0200 |
|---|---|---|
| committer | Olivier Masse <olivier.masse@nxp.com> | 2018-11-13 15:15:59 +0100 |
| commit | 1e61b6e298e14e0bb00854ab0240752ad6989c79 (patch) | |
| tree | dd7b9c77acf74e123915a7898ab124fc47bcd466 | |
| parent | ac0b499ff6618e0bb4d0cdb55009f75c914d4fe7 (diff) | |
MMIOT-152 + MMIOT-157 : move specific RDC configuration from driver to board setup
Signed-off-by: Olivier Masse <olivier.masse@nxp.com>
| -rw-r--r-- | plat/imx/common/imx8m/imx_rdc.c | 14 | ||||
| -rw-r--r-- | plat/imx/imx8mm/imx8mm_bl31_setup.c | 9 | ||||
| -rw-r--r-- | plat/imx/imx8mq/imx8mq_bl31_setup.c | 11 |
3 files changed, 25 insertions, 9 deletions
diff --git a/plat/imx/common/imx8m/imx_rdc.c b/plat/imx/common/imx8m/imx_rdc.c index 35c5362e..1a21cd31 100644 --- a/plat/imx/common/imx8m/imx_rdc.c +++ b/plat/imx/common/imx8m/imx_rdc.c @@ -160,17 +160,17 @@ static struct rdc_mda_conf masters_config[] = { #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 cc7e15ed..5361fca5 100644 --- a/plat/imx/imx8mm/imx8mm_bl31_setup.c +++ b/plat/imx/imx8mm/imx8mm_bl31_setup.c @@ -78,6 +78,13 @@ static entry_point_info_t bl33_image_ep_info; #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 */ @@ -89,7 +96,7 @@ static void bl31_imx_rdc_setup(void) 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 8577104b..12c610ae 100644 --- a/plat/imx/imx8mq/imx8mq_bl31_setup.c +++ b/plat/imx/imx8mq/imx8mq_bl31_setup.c @@ -73,8 +73,17 @@ static entry_point_info_t bl33_image_ep_info; #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) { @@ -84,7 +93,7 @@ static void bl31_imx_rdc_setup(void) 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 |