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

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

Merge "ARM: dts: msm: add perf-events support for msm8909"

parents 77bfde8b 274a8b64

arch/arm/boot/dts/qcom/msm8909.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -779,6 +779,12 @@ 
		qcom,client-id = <0x011013ed>;

	};



	cpu-pmu {

		compatible = "arm,cortex-a7-pmu";

		qcom,irq-is-percpu;

		interrupts = <1 7 0xf00>;

	};



	jtag_fuse: jtagfuse@5e01c {

		compatible = "qcom,jtag-fuse";

		reg = <0x5e01c 0x8>;

arch/arm/mach-msm/perf_debug.c

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ static char *descriptions = 
	"25 msm: perf: reset perf cycle counter on krait\n"

	"26 Perf: interrupt disable without bringing cpus up\n"

	"27 Perf: stop counters when going into hotplug\n"

	"28 ARM: dts: msm: add perf-events support for msm8909\n"

;



static ssize_t desc_read(struct file *fp, char __user *buf,