diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/drivers/arm/gicv3.h | 4 | ||||
| -rw-r--r-- | include/drivers/arm/tzc400.h | 4 | ||||
| -rw-r--r-- | include/drivers/io/io_storage.h | 2 | ||||
| -rw-r--r-- | include/plat/arm/common/plat_arm.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/drivers/arm/gicv3.h b/include/drivers/arm/gicv3.h index f2a53712..5f265c6e 100644 --- a/include/drivers/arm/gicv3.h +++ b/include/drivers/arm/gicv3.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -402,7 +402,7 @@ void gicv3_disable_interrupt(unsigned int id, unsigned int proc_num); void gicv3_set_interrupt_priority(unsigned int id, unsigned int proc_num, unsigned int priority); void gicv3_set_interrupt_type(unsigned int id, unsigned int proc_num, - unsigned int group); + unsigned int type); void gicv3_raise_secure_g0_sgi(int sgi_num, u_register_t target); void gicv3_set_spi_routing(unsigned int id, unsigned int irm, u_register_t mpidr); diff --git a/include/drivers/arm/tzc400.h b/include/drivers/arm/tzc400.h index 038a3baa..7f354f82 100644 --- a/include/drivers/arm/tzc400.h +++ b/include/drivers/arm/tzc400.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -118,7 +118,7 @@ void tzc400_configure_region(unsigned int filters, unsigned long long region_base, unsigned long long region_top, tzc_region_attributes_t sec_attr, - unsigned int ns_device_access); + unsigned int nsaid_permissions); void tzc400_set_action(tzc_action_t action); void tzc400_enable_filters(void); void tzc400_disable_filters(void); diff --git a/include/drivers/io/io_storage.h b/include/drivers/io/io_storage.h index 50907ff7..485ed8c0 100644 --- a/include/drivers/io/io_storage.h +++ b/include/drivers/io/io_storage.h @@ -70,7 +70,7 @@ typedef struct io_block_spec { /* Open a connection to a device */ int io_dev_open(const struct io_dev_connector *dev_con, const uintptr_t dev_spec, - uintptr_t *dev_handle); + uintptr_t *handle); /* Initialise a device explicitly - to permit lazy initialisation or diff --git a/include/plat/arm/common/plat_arm.h b/include/plat/arm/common/plat_arm.h index b2c7bd27..66efe450 100644 --- a/include/plat/arm/common/plat_arm.h +++ b/include/plat/arm/common/plat_arm.h @@ -125,7 +125,7 @@ int arm_validate_ns_entrypoint(uintptr_t entrypoint); void arm_system_pwr_domain_save(void); void arm_system_pwr_domain_resume(void); void arm_program_trusted_mailbox(uintptr_t address); -int arm_psci_read_mem_protect(int *val); +int arm_psci_read_mem_protect(int *enabled); int arm_nor_psci_write_mem_protect(int val); void arm_nor_psci_do_mem_protect(void); int arm_psci_mem_protect_chk(uintptr_t base, u_register_t length); |