summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2019-07-28 23:22:40 +0300
committerThomas Gleixner <tglx@linutronix.de>2019-07-28 23:22:40 +0300
commit7a30bdd99f37352b188575b27924c407c6ddff9e (patch)
tree10ea40ab1b5211e75c33eaddb3a6b393ad6ee7ad /Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt
parentf36cf386e3fec258a341d446915862eded3e13d8 (diff)
parent609488bc979f99f805f34e9a32c1e3b71179d10b (diff)
downloadlinux-7a30bdd99f37352b188575b27924c407c6ddff9e.tar.xz
Merge branch master from git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Pick up the spectre documentation so the Grand Schemozzle can be added.
Diffstat (limited to 'Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt')
-rw-r--r--Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt b/Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt
index 298291211ea4..f1de3247c1b7 100644
--- a/Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt
+++ b/Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt
@@ -26,8 +26,8 @@ Required properties:
processor core is clocked by the internal CPU clock, so it
is enabled with CPU clock by default.
-- cpu : the CPU phandle the debug module is affined to. When omitted
- the module is considered to belong to CPU0.
+- cpu : the CPU phandle the debug module is affined to. Do not assume it
+ to default to CPU0 if omitted.
Optional properties: