diff options
| author | danh-arm <dan.handley@arm.com> | 2014-11-04 16:01:40 +0000 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2014-11-04 16:01:40 +0000 |
| commit | e73f4ef6072096584f44cb0046c78194df359e8a (patch) | |
| tree | e5b1602b93cf92d37cd8601fd46dd0b0a68ed369 /plat/juno/plat_pm.c | |
| parent | 82b9b2973b108e91367159f2f42dec2fc45f168d (diff) | |
| parent | 33132e643a030847529c324e41c673e54a81a1ee (diff) | |
Merge pull request #219 from jcastillo-arm/jc/tf-issues/253
Improvements to ARM GIC driver
Juno: Use the generic ARM GIC driver
Diffstat (limited to 'plat/juno/plat_pm.c')
| -rw-r--r-- | plat/juno/plat_pm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plat/juno/plat_pm.c b/plat/juno/plat_pm.c index a3f6bdd5..adf599f4 100644 --- a/plat/juno/plat_pm.c +++ b/plat/juno/plat_pm.c @@ -30,6 +30,7 @@ #include <assert.h> #include <arch_helpers.h> +#include <arm_gic.h> #include <debug.h> #include <cci400.h> #include <errno.h> @@ -133,10 +134,10 @@ int32_t juno_affinst_on_finish(uint64_t mpidr, uint32_t afflvl, uint32_t state) /* Enable the gic cpu interface */ - gic_cpuif_setup(GICC_BASE); + arm_gic_cpuif_setup(); /* Juno todo: Is this setup only needed after a cold boot? */ - gic_pcpu_distif_setup(GICD_BASE); + arm_gic_pcpu_distif_setup(); /* Clear the mailbox for this cpu. */ juno_program_mailbox(mpidr, 0); @@ -155,7 +156,7 @@ static int32_t juno_power_down_common(uint32_t afflvl) uint32_t cluster_state = scpi_power_on; /* Prevent interrupts from spuriously waking up this cpu */ - gic_cpuif_deactivate(GICC_BASE); + arm_gic_cpuif_deactivate(); /* Cluster is to be turned off, so disable coherency */ if (afflvl > MPIDR_AFFLVL0) { |