diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-03 14:28:50 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-03 14:28:50 (GMT) |
| commit | 3ff32a0def6e0d2e21a6c5ad1b00726592774018 (patch) | |
| tree | af683b2cb62f7e5ee18cb109d15dcfd43769b984 /Documentation | |
| parent | 40d3f02851577da27b5cbb1538888301245ef1e7 (diff) | |
| parent | 81497953e37bc28209d9a647171ea93b4a99fc57 (diff) | |
| download | linux-3ff32a0def6e0d2e21a6c5ad1b00726592774018.tar.xz | |
Merge branch 'devel-stable' into for-linus
Conflicts:
drivers/perf/arm_pmu.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/pmu.txt | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/arm/pmu.txt b/Documentation/devicetree/bindings/arm/pmu.txt index 3b5f5d1..435251f 100644 --- a/Documentation/devicetree/bindings/arm/pmu.txt +++ b/Documentation/devicetree/bindings/arm/pmu.txt @@ -26,13 +26,19 @@ Required properties: Optional properties: -- interrupt-affinity : Valid only when using SPIs, specifies a list of phandles - to CPU nodes corresponding directly to the affinity of +- interrupt-affinity : When using SPIs, specifies a list of phandles to CPU + nodes corresponding directly to the affinity of the SPIs listed in the interrupts property. - This property should be present when there is more than + When using a PPI, specifies a list of phandles to CPU + nodes corresponding to the set of CPUs which have + a PMU of this type signalling the PPI listed in the + interrupts property. + + This property should be present when there is more than a single SPI. + - qcom,no-pc-write : Indicates that this PMU doesn't support the 0xc and 0xd events. |