diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/bl31/services/psci.h | 1 | ||||
| -rw-r--r-- | include/drivers/arm/pl011.h | 16 |
2 files changed, 9 insertions, 8 deletions
diff --git a/include/bl31/services/psci.h b/include/bl31/services/psci.h index 570fe5b8..b6e272c3 100644 --- a/include/bl31/services/psci.h +++ b/include/bl31/services/psci.h @@ -190,6 +190,7 @@ extern void psci_system_reset(void); extern int psci_cpu_on(unsigned long, unsigned long, unsigned long); +extern void __dead2 psci_power_down_wfi(void); extern void psci_aff_on_finish_entry(void); extern void psci_aff_suspend_finish_entry(void); extern void psci_register_spd_pm_hook(const spd_pm_ops_t *); diff --git a/include/drivers/arm/pl011.h b/include/drivers/arm/pl011.h index 12549206..281330e4 100644 --- a/include/drivers/arm/pl011.h +++ b/include/drivers/arm/pl011.h @@ -107,32 +107,32 @@ * Pl011 CPU interface accessors for writing registers ******************************************************************************/ -static inline void pl011_write_ibrd(unsigned int base, unsigned int val) +static inline void pl011_write_ibrd(unsigned long base, unsigned int val) { mmio_write_32(base + UARTIBRD, val); } -static inline void pl011_write_fbrd(unsigned int base, unsigned int val) +static inline void pl011_write_fbrd(unsigned long base, unsigned int val) { mmio_write_32(base + UARTFBRD, val); } -static inline void pl011_write_lcr_h(unsigned int base, unsigned int val) +static inline void pl011_write_lcr_h(unsigned long base, unsigned int val) { mmio_write_32(base + UARTLCR_H, val); } -static inline void pl011_write_ecr(unsigned int base, unsigned int val) +static inline void pl011_write_ecr(unsigned long base, unsigned int val) { mmio_write_32(base + UARTECR, val); } -static inline void pl011_write_cr(unsigned int base, unsigned int val) +static inline void pl011_write_cr(unsigned long base, unsigned int val) { mmio_write_32(base + UARTCR, val); } -static inline void pl011_write_dr(unsigned int base, unsigned int val) +static inline void pl011_write_dr(unsigned long base, unsigned int val) { mmio_write_32(base + UARTDR, val); } @@ -141,12 +141,12 @@ static inline void pl011_write_dr(unsigned int base, unsigned int val) * Pl011 CPU interface accessors for reading registers ******************************************************************************/ -static inline unsigned int pl011_read_fr(unsigned int base) +static inline unsigned int pl011_read_fr(unsigned long base) { return mmio_read_32(base + UARTFR); } -static inline unsigned int pl011_read_dr(unsigned int base) +static inline unsigned int pl011_read_dr(unsigned long base) { return mmio_read_32(base + UARTDR); } |