diff options
| author |  Will Deacon <will@kernel.org>
| 2022-03-08 13:33:34 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org>
| 2022-03-08 13:33:34 +0000 |
| commit | 0162052214c7e850566ecef41003603c26667b5d (patch) | |
| tree | 4dc00397b33a616818518f41926c0dbfca4f0595 /drivers/perf/Makefile | |
| parent | arm64: perf: Consistently make all event numbers as 16-bits (diff) | |
| parent | drivers/perf: Add Apple icestorm/firestorm CPU PMU driver (diff) | |
| download | linux-0162052214c7e850566ecef41003603c26667b5d.tar.gz linux-0162052214c7e850566ecef41003603c26667b5d.tar.bz2 linux-0162052214c7e850566ecef41003603c26667b5d.zip | |
Merge branch 'for-next/perf-m1' into for-next/perf
Support for the CPU PMUs on the Apple M1.
* for-next/perf-m1:
drivers/perf: Add Apple icestorm/firestorm CPU PMU driver
drivers/perf: arm_pmu: Handle 47 bit counters
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 'drivers/perf/Makefile')
| -rw-r--r-- | drivers/perf/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/perf/Makefile b/drivers/perf/Makefile index df52fb5ea2a6..4f43080ec54e 100644 --- a/drivers/perf/Makefile +++ b/drivers/perf/Makefile @@ -16,3 +16,4 @@ obj-$(CONFIG_ARM_SPE_PMU) += arm_spe_pmu.o obj-$(CONFIG_ARM_DMC620_PMU) += arm_dmc620_pmu.o obj-$(CONFIG_MARVELL_CN10K_TAD_PMU) += marvell_cn10k_tad_pmu.o obj-$(CONFIG_MARVELL_CN10K_DDR_PMU) += marvell_cn10k_ddr_pmu.o +obj-$(CONFIG_APPLE_M1_CPU_PMU) += apple_m1_cpu_pmu.o |