diff options
author | Olivier Masse <olivier.masse@nxp.com> | 2018-09-25 15:59:35 +0200 |
---|---|---|
committer | Olivier Masse <olivier.masse@nxp.com> | 2018-11-13 15:15:59 +0100 |
commit | ac0b499ff6618e0bb4d0cdb55009f75c914d4fe7 (patch) | |
tree | c3b3ce4c548dac49bb952f251557f8fba9b92edf /plat/imx/common | |
parent | 2fb1862f155399cfb939bb35cf94e249b76ce74f (diff) |
MMIOT-152 Rebase on imx_1.5.y + imx8mm : DRM RDC config added
Signed-off-by: Olivier Masse <olivier.masse@nxp.com>
Diffstat (limited to 'plat/imx/common')
-rw-r--r-- | plat/imx/common/imx8m/imx_rdc.c | 20 | ||||
-rw-r--r-- | plat/imx/common/sip_svc.c | 1 |
2 files changed, 12 insertions, 9 deletions
diff --git a/plat/imx/common/imx8m/imx_rdc.c b/plat/imx/common/imx8m/imx_rdc.c index 337db739..35c5362e 100644 --- a/plat/imx/common/imx8m/imx_rdc.c +++ b/plat/imx/common/imx8m/imx_rdc.c @@ -61,6 +61,10 @@ int imx_rdc_set_pdap(struct rdc_pdap_conf *p) reg |= RDC_PDAP_SREQ_MASK; /* Setup Lock from input */ reg |= p->lock << RDC_PDAP_LCK_SHIFT; + + NOTICE("imx_rdc_set_pdap(): write addr=0x%p, reg=0x%x\n", + &imx_rdc->pdap[p->index], reg); + mmio_write_32((uintptr_t)&imx_rdc->pdap[p->index], reg); return 0; @@ -115,7 +119,7 @@ int imx_rdc_set_mda(struct rdc_mda_conf *p) if (!r.lock) { reg = (p->domain & RDC_MDA_DID_MASK) | ((p->lock << RDC_MDA_LCK_SHIFT) & RDC_MDA_LCK_MASK); - NOTICE("imx_rdc_setup_mda(): write addr=0x%p, reg=0x%x\n", + NOTICE("imx_rdc_setup_mda(): write addr=%p, reg=0x%x\n", &imx_rdc->mda[p->index], reg); mmio_write_32((uintptr_t)&imx_rdc->mda[p->index], reg); } else { @@ -156,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_GPIO1, 0x3, 0}, - {RDC_PDAP_GPIO2, 0x3, 0}, - {RDC_PDAP_GPIO3, 0x3, 0}, - {RDC_PDAP_GPIO4, 0x3, 0}, - {RDC_PDAP_GPIO5, 0x3, 0}, + {RDC_PDAP_GPU_EXSC, 0x0C, 0}, + {RDC_PDAP_VPU_SEC, 0x33, 0}, }; /* Default masters settings as an example */ static struct rdc_mda_conf masters_config[] = { - {RDC_MDA_A53, 0, 0}, - {RDC_MDA_CAAM, 0, 0}, + {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 void imx_rdc_set_peripherals_default(void) diff --git a/plat/imx/common/sip_svc.c b/plat/imx/common/sip_svc.c index 4f74c7be..79009826 100644 --- a/plat/imx/common/sip_svc.c +++ b/plat/imx/common/sip_svc.c @@ -112,7 +112,6 @@ uintptr_t imx_svc_smc_handler(uint32_t smc_fid, void *handle, uint64_t flags) { - NOTICE("smc_fid is %x\n", smc_fid); switch (smc_fid) { #if defined(PLAT_IMX8M) || defined(PLAT_IMX8MM) case FSL_SIP_DDR_DVFS: |