Merge tag 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford...

[cascardo/linux.git] / Documentation / devicetree / bindings / arm / pmu.txt

diff --git a/Documentation/devicetree/bindings/arm/pmu.txt b/Documentation/devicetree/bindings/arm/pmu.txt
index 74d5417..61c8b46 100644 (file)
--- a/Documentation/devicetree/bindings/arm/pmu.txt
+++ b/Documentation/devicetree/bindings/arm/pmu.txt
@@ -39,7 +39,9 @@ Optional properties:
                        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.
+                      interrupts property, unless this is already specified
+                      by the PPI interrupt specifier itself (in which case
+                      the interrupt-affinity property shouldn't be present).
 
                        This property should be present when there is more than
                       a single SPI.