diff options
| author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2020-02-12 15:51:42 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-02-12 15:51:42 +0000 |
| commit | c83d66ec63484fdd7905fabcf48fe04f9ebf5feb (patch) | |
| tree | 6b786e046e67ba4888efefa35a186e6eb99897e5 /drivers | |
| parent | 572fcdd547753d668ca1146ca420664ccc3ac6fb (diff) | |
| parent | 621146d851d474359f7d577b83a5424d1682f622 (diff) | |
| download | platform_external_arm-trusted-firmware-c83d66ec63484fdd7905fabcf48fe04f9ebf5feb.tar.gz platform_external_arm-trusted-firmware-c83d66ec63484fdd7905fabcf48fe04f9ebf5feb.tar.bz2 platform_external_arm-trusted-firmware-c83d66ec63484fdd7905fabcf48fe04f9ebf5feb.zip | |
Merge changes Ib68092d1,I816ea14e into integration
* changes:
plat: marvell: armada: scp_bl2: allow loading up to 8 images
plat: marvell: armada: add support for loading MG CM3 images
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/marvell/mochi/cp110_setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/marvell/mochi/cp110_setup.c b/drivers/marvell/mochi/cp110_setup.c index b4b4e0c82..7186f9857 100644 --- a/drivers/marvell/mochi/cp110_setup.c +++ b/drivers/marvell/mochi/cp110_setup.c @@ -303,7 +303,7 @@ static void cp110_axi_attr_init(uintptr_t base) DOMAIN_SYSTEM_SHAREABLE); } -static void amb_bridge_init(uintptr_t base) +void cp110_amb_init(uintptr_t base) { uint32_t reg; @@ -399,7 +399,7 @@ void cp110_init(uintptr_t cp110_base, uint32_t stream_id) cp110_stream_id_init(cp110_base, stream_id); /* Open AMB bridge for comphy for CP0 & CP1*/ - amb_bridge_init(cp110_base); + cp110_amb_init(cp110_base); /* Reset RTC if needed */ cp110_rtc_init(cp110_base); @@ -411,7 +411,7 @@ void cp110_ble_init(uintptr_t cp110_base) #if PCI_EP_SUPPORT INFO("%s: Initialize CPx - base = %lx\n", __func__, cp110_base); - amb_bridge_init(cp110_base); + cp110_amb_init(cp110_base); /* Configure PCIe clock */ cp110_pcie_clk_cfg(cp110_base); |