diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-09-06 13:03:39 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-09-06 13:03:39 +0200 |
| commit | 9cc5b7fba57919a7d96f89ce79ba99d1dd1af965 (patch) | |
| tree | 2c23d97ba0c7d0ff37880d57328a0966ee01a209 /arch/arm | |
| parent | 101f85b56d03b36418bbf867f67d81710839b0ec (diff) | |
| parent | c9c96e30ecaa0aafa225aa1a5392cb7db17c7a82 (diff) | |
| download | linux-9cc5b7fba57919a7d96f89ce79ba99d1dd1af965.tar.bz2 | |
Merge tag 'irqchip-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull irqchip updates for Linux 5.4 from Marc Zyngier:
- Large GICv3 updates to support new PPI and SPI ranges
- Conver all alloc_fwnode() users to use PAs instead of VAs
- Add support for Marvell's MMP3 irqchip
- Add support for Amlogic Meson SM1
- Various cleanups and fixes
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-mmp/regs-icu.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-mmp/regs-icu.h b/arch/arm/mach-mmp/regs-icu.h index 0375d5a7fcb2..410743d2b402 100644 --- a/arch/arm/mach-mmp/regs-icu.h +++ b/arch/arm/mach-mmp/regs-icu.h @@ -11,6 +11,9 @@ #define ICU_VIRT_BASE (AXI_VIRT_BASE + 0x82000) #define ICU_REG(x) (ICU_VIRT_BASE + (x)) +#define ICU2_VIRT_BASE (AXI_VIRT_BASE + 0x84000) +#define ICU2_REG(x) (ICU2_VIRT_BASE + (x)) + #define ICU_INT_CONF(n) ICU_REG((n) << 2) #define ICU_INT_CONF_MASK (0xf) |