diff options
author | danh-arm <dan.handley@arm.com> | 2015-03-17 14:28:48 +0000 |
---|---|---|
committer | danh-arm <dan.handley@arm.com> | 2015-03-17 14:28:48 +0000 |
commit | 541d788175f5df2f9be34f30bc2b724135c2ceb9 (patch) | |
tree | 49400e3dbf1272ebc3ece37c942fd341dc66a043 /plat/juno/plat_pm.c | |
parent | 27bc0106665eddf3e6f84101e73e27b823867bef (diff) | |
parent | 4991ecdc50ff7b72e5d80b4cc8b6ef8c0fbe036e (diff) |
Merge pull request #269 from vikramkanigiri/vk/common-cci
Common driver for ARM cache coherent Interconnects
Diffstat (limited to 'plat/juno/plat_pm.c')
-rw-r--r-- | plat/juno/plat_pm.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/plat/juno/plat_pm.c b/plat/juno/plat_pm.c index 47338cfc..953e5f72 100644 --- a/plat/juno/plat_pm.c +++ b/plat/juno/plat_pm.c @@ -31,8 +31,8 @@ #include <assert.h> #include <arch_helpers.h> #include <arm_gic.h> +#include <cci.h> #include <debug.h> -#include <cci400.h> #include <errno.h> #include <platform.h> #include <platform_def.h> @@ -159,8 +159,7 @@ void juno_affinst_on_finish(uint32_t afflvl, uint32_t state) * if this cluster was off. */ if (afflvl != MPIDR_AFFLVL0) - cci_enable_cluster_coherency(mpidr); - + cci_enable_snoop_dvm_reqs(MPIDR_AFFLVL1_VAL(mpidr)); /* Enable the gic cpu interface */ arm_gic_cpuif_setup(); @@ -187,7 +186,7 @@ static void juno_power_down_common(uint32_t afflvl) /* Cluster is to be turned off, so disable coherency */ if (afflvl > MPIDR_AFFLVL0) { - cci_disable_cluster_coherency(read_mpidr_el1()); + cci_disable_snoop_dvm_reqs(MPIDR_AFFLVL1_VAL(read_mpidr())); cluster_state = scpi_power_off; } |