diff options
author | Mark Brown <broonie@kernel.org> | 2015-03-03 09:34:08 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-03 09:34:08 +0000 |
commit | 3af2dae32ca1108e47a435eaeec276a1c8289a36 (patch) | |
tree | db7307f044a9c83a9b712d6f572adbb6e6f81d05 /Documentation | |
parent | 21d7f14b70fed254222a24e124e8771e1437be4c (diff) | |
parent | 426bf85880ce1f08afa33e44b83961e231ec923e (diff) |
Merge remote-tracking branch 'lsk/v3.14/topic/coresight' into linux-linaro-lsk-v3.14
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/arm/coresight.txt | 4 | ||||
-rw-r--r-- | Documentation/trace/coresight.txt | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/arm/coresight.txt b/Documentation/devicetree/bindings/arm/coresight.txt index d790f49066f3..a3089359aaa6 100644 --- a/Documentation/devicetree/bindings/arm/coresight.txt +++ b/Documentation/devicetree/bindings/arm/coresight.txt @@ -38,8 +38,6 @@ its hardware characteristcs. AMBA markee): - "arm,coresight-replicator" - * id: a unique number that will identify this replicator. - * port or ports: same as above. * Optional properties for ETM/PTMs: @@ -94,8 +92,6 @@ Example: * AMBA bus. As such no need to add "arm,primecell". */ compatible = "arm,coresight-replicator"; - /* this will show up in debugfs as "0.replicator" */ - id = <0>; ports { #address-cells = <1>; diff --git a/Documentation/trace/coresight.txt b/Documentation/trace/coresight.txt index bba7dbfc49ed..02361552a3ea 100644 --- a/Documentation/trace/coresight.txt +++ b/Documentation/trace/coresight.txt @@ -46,7 +46,7 @@ At typical coresight system would look like this: | | . | ! | | . | ! | ! . | | SWD/ | | . | ! | | . | ! | ! . | | JTAG *****************************************************************<-| - *************************** AMBA Debug ABP ************************ + *************************** AMBA Debug APB ************************ ***************************************************************** | . ! . ! ! . | | . * . * * . | @@ -79,7 +79,7 @@ At typical coresight system would look like this: To trace port TPIU= Trace Port Interface Unit SWD = Serial Wire Debug -While on target configuration of the components is done via the ABP bus, +While on target configuration of the components is done via the APB bus, all trace data are carried out-of-band on the ATB bus. The CTM provides a way to aggregate and distribute signals between CoreSight components. |