diff options
| author |   Will Deacon <will@kernel.org> | 2022-03-08 13:32:28 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-03-08 13:32:28 +0000 |
| commit | 47804aab73d85147b9110a8cb025e01f8638e77d (patch) | |
| tree | 82206fa0b758859c1eb230e81fe207615e37ec8f /include | |
| parent | Linux 5.17-rc3 (diff) | |
| parent | irqchip/apple-aic: Move PMU-specific registers to their own include file (diff) | |
| download | linux-dev-47804aab73d85147b9110a8cb025e01f8638e77d.tar.xz linux-dev-47804aab73d85147b9110a8cb025e01f8638e77d.zip | |
Merge branch 'irq/aic-pmu' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into for-next/perf-m1
Pull in Apple AIC rework from Marc Zyngier to support PMU interrupts on
the M1 platform.
* 'irq/aic-pmu' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms:
irqchip/apple-aic: Move PMU-specific registers to their own include file
arm64: dts: apple: Add t8303 PMU nodes
arm64: dts: apple: Add t8103 PMU interrupt affinities
irqchip/apple-aic: Wire PMU interrupts
irqchip/apple-aic: Parse FIQ affinities from device-tree
dt-bindings: apple,aic: Add affinity description for per-cpu pseudo-interrupts
dt-bindings: apple,aic: Add CPU PMU per-cpu pseudo-interrupts
dt-bindings: arm-pmu: Document Apple PMU compatible strings
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/interrupt-controller/apple-aic.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/dt-bindings/interrupt-controller/apple-aic.h b/include/dt-bindings/interrupt-controller/apple-aic.h index 604f2bb30ac0..bf3aac0e5491 100644 --- a/include/dt-bindings/interrupt-controller/apple-aic.h +++ b/include/dt-bindings/interrupt-controller/apple-aic.h @@ -11,5 +11,7 @@ #define AIC_TMR_HV_VIRT 1 #define AIC_TMR_GUEST_PHYS 2 #define AIC_TMR_GUEST_VIRT 3 +#define AIC_CPU_PMU_E 4 +#define AIC_CPU_PMU_P 5 #endif |