Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

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

diff --git a/Documentation/devicetree/bindings/arm/coresight.txt b/Documentation/devicetree/bindings/arm/coresight.txt
index 65a6db2..62938eb 100644 (file)
--- a/Documentation/devicetree/bindings/arm/coresight.txt
+++ b/Documentation/devicetree/bindings/arm/coresight.txt
@@ -17,6 +17,7 @@ its hardware characteristcs.
                - "arm,coresight-tmc", "arm,primecell";
                - "arm,coresight-funnel", "arm,primecell";
                - "arm,coresight-etm3x", "arm,primecell";
+               - "arm,coresight-etm4x", "arm,primecell";
                - "qcom,coresight-replicator1x", "arm,primecell";
 
        * reg: physical base address and length of the register