Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a45925f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: build kryo perf events only for MSM8996"

parents 71f2f97d bb8aea09

arch/arm64/kernel/perf_event.c

+2 −0
Original line number Diff line number Diff line
@@ -674,7 +674,9 @@ static const struct of_device_id armv8_pmu_of_device_ids[] = { 
	{.compatible = "arm,armv8-pmuv3",	.data = armv8_pmuv3_init},

	{.compatible = "arm,cortex-a53-pmu",	.data = armv8_a53_pmu_init},

	{.compatible = "arm,cortex-a57-pmu",	.data = armv8_a57_pmu_init},

#ifdef CONFIG_ARCH_MSM8996

	{.compatible = "qcom,kryo-pmuv3", .data = kryo_pmu_init},

#endif

	{},

};

drivers/soc/qcom/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -83,7 +83,9 @@ obj-$(CONFIG_MSM_GLADIATOR_HANG_DETECT) += gladiator_hang_detect.o 
obj-$(CONFIG_MSM_RUN_QUEUE_STATS) += msm_rq_stats.o

obj-$(CONFIG_MSM_BOOT_STATS) += boot_stats.o

obj-$(CONFIG_MSM_AVTIMER) += avtimer.o

ifdef CONFIG_ARCH_MSM8996

obj-$(CONFIG_HW_PERF_EVENTS) += perf_event_kryo.o

endif

obj-$(CONFIG_MSM_JTAGV8) += jtag-fuse.o jtagv8.o jtagv8-etm.o

obj-$(CONFIG_MSM_KERNEL_PROTECT) += kernel_protect.o

obj-$(CONFIG_MSM_RTB) += msm_rtb-hotplug.o