diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2018-09-04 03:35:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-04 03:35:54 +0100 |
| commit | ebf417aa83b7c202055226fadf9d93d214f750fe (patch) | |
| tree | 14653b9d56b9efcc9525d74835b611c373af8f0e /include/drivers | |
| parent | 100992b531f6dc5fadb7326216f430531b21dba7 (diff) | |
| parent | 6d55ef1a24dc92a3b737aaa02141f550caaace06 (diff) | |
| download | platform_external_arm-trusted-firmware-ebf417aa83b7c202055226fadf9d93d214f750fe.tar.gz platform_external_arm-trusted-firmware-ebf417aa83b7c202055226fadf9d93d214f750fe.tar.bz2 platform_external_arm-trusted-firmware-ebf417aa83b7c202055226fadf9d93d214f750fe.zip | |
Merge pull request #1540 from MISL-EBU-System-SW/marvell-updates-18.09
Marvell updates 18.09
Diffstat (limited to 'include/drivers')
| -rw-r--r-- | include/drivers/arm/gicv2.h | 1 | ||||
| -rw-r--r-- | include/drivers/marvell/aro.h | 1 | ||||
| -rw-r--r-- | include/drivers/marvell/mochi/cp110_setup.h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/include/drivers/arm/gicv2.h b/include/drivers/arm/gicv2.h index 02ffa0235..d0480dba2 100644 --- a/include/drivers/arm/gicv2.h +++ b/include/drivers/arm/gicv2.h @@ -191,6 +191,7 @@ void gicv2_set_spi_routing(unsigned int id, int proc_num); void gicv2_set_interrupt_pending(unsigned int id); void gicv2_clear_interrupt_pending(unsigned int id); unsigned int gicv2_set_pmr(unsigned int mask); +void gicv2_interrupt_set_cfg(unsigned int id, unsigned int cfg); #endif /* __ASSEMBLY__ */ #endif /* __GICV2_H__ */ diff --git a/include/drivers/marvell/aro.h b/include/drivers/marvell/aro.h index 3627a201c..37e211f0f 100644 --- a/include/drivers/marvell/aro.h +++ b/include/drivers/marvell/aro.h @@ -29,6 +29,7 @@ enum cpu_clock_freq_mode { CPU_1800_DDR_1050_RCLK_1050 = 0x7, CPU_1600_DDR_900_RCLK_900 = 0x0B, CPU_1600_DDR_1050_RCLK_1050 = 0x0D, + CPU_1600_DDR_1200_RCLK_1200 = 0x0D, CPU_1600_DDR_900_RCLK_900_2 = 0x0E, CPU_1000_DDR_650_RCLK_650 = 0x13, CPU_1300_DDR_800_RCLK_800 = 0x14, diff --git a/include/drivers/marvell/mochi/cp110_setup.h b/include/drivers/marvell/mochi/cp110_setup.h index 1c88980ae..839efe1ba 100644 --- a/include/drivers/marvell/mochi/cp110_setup.h +++ b/include/drivers/marvell/mochi/cp110_setup.h @@ -20,6 +20,7 @@ #define MVEBU_DEVICE_REV_MASK (0xf << MVEBU_DEVICE_REV_OFFSET) #define MVEBU_70X0_DEV_ID (0x7040) #define MVEBU_70X0_CP115_DEV_ID (0x7045) +#define MVEBU_3900_DEV_ID (0x6025) #define MVEBU_80X0_DEV_ID (0x8040) #define MVEBU_80X0_CP115_DEV_ID (0x8045) #define MVEBU_CP110_SA_DEV_ID (0x110) |